mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 14:50:13 -05:00
- made custom (de)buff watcher bars respect the bForceHide option for :Show() so that they are properly hidden when a profile change occurs or they are manually disabled via the options menu
This commit is contained in:
@ -446,7 +446,7 @@ function IceCore.prototype:Disable(userToggle)
|
|||||||
|
|
||||||
self:ConfigModeToggle(false)
|
self:ConfigModeToggle(false)
|
||||||
|
|
||||||
for i = 1, table.getn(self.elements) do
|
for i=1, #self.elements do
|
||||||
if (self.elements[i]:IsEnabled()) then
|
if (self.elements[i]:IsEnabled()) then
|
||||||
self.elements[i]:Disable(true)
|
self.elements[i]:Disable(true)
|
||||||
end
|
end
|
||||||
|
@ -89,12 +89,6 @@ function IceCustomBar.prototype:TargetChanged()
|
|||||||
self:UpdateCustomBar(self.unit)
|
self:UpdateCustomBar(self.unit)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCustomBar.prototype:Disable(core)
|
|
||||||
IceHUD.IceCore:RequestUpdates(self, nil)
|
|
||||||
|
|
||||||
IceCustomBar.super.prototype.Disable(self, core)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- OVERRIDE
|
-- OVERRIDE
|
||||||
function IceCustomBar.prototype:GetDefaultSettings()
|
function IceCustomBar.prototype:GetDefaultSettings()
|
||||||
local settings = IceCustomBar.super.prototype.GetDefaultSettings(self)
|
local settings = IceCustomBar.super.prototype.GetDefaultSettings(self)
|
||||||
@ -749,7 +743,12 @@ function IceCustomBar.prototype:OutCombat()
|
|||||||
self:UpdateCustomBar(self.unit)
|
self:UpdateCustomBar(self.unit)
|
||||||
end
|
end
|
||||||
|
|
||||||
function IceCustomBar.prototype:Show(bShouldShow)
|
function IceCustomBar.prototype:Show(bShouldShow, bForceHide)
|
||||||
|
if bForceHide then
|
||||||
|
IceCustomBar.super.prototype.Show(self, bShouldShow, bForceHide)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
if self.moduleSettings.displayWhenTargeting and self.target then
|
if self.moduleSettings.displayWhenTargeting and self.target then
|
||||||
IceCustomBar.super.prototype.Show(self, true)
|
IceCustomBar.super.prototype.Show(self, true)
|
||||||
elseif self.moduleSettings.displayWhenEmpty then
|
elseif self.moduleSettings.displayWhenEmpty then
|
||||||
|
Reference in New Issue
Block a user