wow-mods/ice-hud
1
0
Fork 0
mirror of https://github.com/parnic/ice-hud.git synced 2025-06-16 14:50:13 -05:00
Code Issues Projects Releases Wiki Activity

- fixed a few taint issues in the ToTHealth and CustomHealth modules

Browse Source 
- removed some duplicated code in CustomHealth for click-targeting
This commit is contained in:
Parnic
2010-07-27 00:30:55 +00:00
parent 374ff3d324
commit 915e36af68
3 changed files with 61 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
modules/CustomHealth.lua
View File

@ -21,7 +21,6 @@ function IceCustomHealth.prototype:GetDefaultSettings()
settings["classColor"] = false
settings["barVerticalOffset"] = 0
settings["scale"] = 1
settings["allowMouseInteraction"] = false
settings["customBarType"] = "Health"
settings["unitToTrack"] = "focustarget"
@ -93,24 +92,6 @@ function IceCustomHealth.prototype:GetOptions()
order = 20.4,
}
opts["allowClickTarget"] = {
type = 'toggle',
name = 'Allow click-targeting',
desc = 'Whether or not to allow click targeting/casting for this bar (Note: does not work properly with HiBar, have to click near the base of the bar)',
get = function()
return self.moduleSettings.allowMouseInteraction
end,
set = function(v)
self.moduleSettings.allowMouseInteraction = v
self:Redraw()
end,
disabled = function()
return not self.moduleSettings.enabled
end,
usage = '',
order = 41,
}
return opts
end
@ -158,60 +139,10 @@ function IceCustomHealth.prototype:Update(unit)
RegisterUnitWatch(self.frame)
end
self:Show(true)
--self.determineColor = false
IceCustomHealth.super.prototype.Update(self, unit)
end
function IceCustomHealth.prototype:CreateBackground()
IceCustomHealth.super.prototype.CreateBackground(self)
if not self.frame.button then
self.frame.button = CreateFrame("Button", nil, self.frame, "SecureUnitButtonTemplate")
end
self.frame.button:ClearAllPoints()
-- Parnic - kinda hacky, but in order to fit this region to multiple types of bars, we need to do this...
-- would be nice to define this somewhere in data, but for now...here we are
if self:GetMyBarTexture() == "HiBar" then
self.frame.button:SetPoint("TOPRIGHT", self.frame, "TOPRIGHT", 0, 0)
self.frame.button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMRIGHT", -1 * self.frame:GetWidth(), 0)
else
if self.moduleSettings.side == IceCore.Side.Left then
self.frame.button:SetPoint("TOPRIGHT", self.frame, "TOPRIGHT", -6, 0)
self.frame.button:SetPoint("BOTTOMLEFT", self.frame, "BOTTOMRIGHT", -1 * self.frame:GetWidth() / 3, 0)
else
self.frame.button:SetPoint("TOPLEFT", self.frame, "TOPLEFT", 6, 0)
self.frame.button:SetPoint("BOTTOMRIGHT", self.frame, "BOTTOMRIGHT", -1 * self.frame:GetWidth() / 1.5, 0)
end
end
self:EnableClickTargeting(self.moduleSettings.allowMouseInteraction)
end
function IceCustomHealth.prototype:EnableClickTargeting(bEnable)
if bEnable then
self.frame.button:EnableMouse(true)
self.frame.button:RegisterForClicks("LeftButtonUp")
self.frame.button:SetAttribute("type1", "target")
-- set up click casting
ClickCastFrames = ClickCastFrames or {}
ClickCastFrames[self.frame.button] = true
-- Parnic - debug code for showing the clickable region on this bar
-- self.frame.button:SetBackdrop({bgFile = "Interface/Tooltips/UI-Tooltip-Background",
-- edgeFile = "Interface/Tooltips/UI-Tooltip-Border",
-- tile = false,
-- insets = { left = 0, right = 0, top = 0, bottom = 0 }});
-- self.frame.button:SetBackdropColor(0,0,0,1);
else
self.frame.button:EnableMouse(false)
self.frame.button:RegisterForClicks()
end
end
function IceCustomHealth.prototype:SetUnit(unit)
IceCustomHealth.super.prototype.SetUnit(self, unit)
if self.frame ~= nil and self.frame.button ~= nil then