mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 14:50:13 -05:00
- fixed text display for non-dogtag strings
This commit is contained in:
@ -55,7 +55,7 @@ end
|
|||||||
|
|
||||||
|
|
||||||
function IceBarElement.prototype:RegisterFontStrings()
|
function IceBarElement.prototype:RegisterFontStrings()
|
||||||
if DogTag ~= nil then
|
if DogTag ~= nil and self.moduleSettings.usesDogTagStrings then
|
||||||
if self.frame.bottomUpperText and self.moduleSettings.upperText then
|
if self.frame.bottomUpperText and self.moduleSettings.upperText then
|
||||||
DogTag:AddFontString(self.frame.bottomUpperText, self.frame, self.moduleSettings.upperText, "Unit", { unit = self.unit })
|
DogTag:AddFontString(self.frame.bottomUpperText, self.frame, self.moduleSettings.upperText, "Unit", { unit = self.unit })
|
||||||
end
|
end
|
||||||
@ -86,6 +86,7 @@ function IceBarElement.prototype:GetDefaultSettings()
|
|||||||
settings["barVisible"] = {bg = true, bar = true}
|
settings["barVisible"] = {bg = true, bar = true}
|
||||||
settings["myTagVersion"] = 2
|
settings["myTagVersion"] = 2
|
||||||
settings["widthModifier"] = 0
|
settings["widthModifier"] = 0
|
||||||
|
settings["usesDogTagStrings"] = true
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
@ -710,7 +711,7 @@ function IceBarElement.prototype:UpdateBar(scale, color, alpha)
|
|||||||
self.barFrame:Show()
|
self.barFrame:Show()
|
||||||
end
|
end
|
||||||
|
|
||||||
if DogTag ~= nil then
|
if DogTag ~= nil and self.moduleSettings.usesDogTagStrings then
|
||||||
DogTag:UpdateAllForFrame(self.frame)
|
DogTag:UpdateAllForFrame(self.frame)
|
||||||
self:SetTextAlpha()
|
self:SetTextAlpha()
|
||||||
end
|
end
|
||||||
@ -746,7 +747,7 @@ function IceBarElement.prototype:SetBottomText1(text, color)
|
|||||||
if (self.moduleSettings.lockUpperTextAlpha and (self.alpha > 0)) then
|
if (self.moduleSettings.lockUpperTextAlpha and (self.alpha > 0)) then
|
||||||
alpha = 1
|
alpha = 1
|
||||||
end
|
end
|
||||||
|
|
||||||
self.frame.bottomUpperText:SetText(text)
|
self.frame.bottomUpperText:SetText(text)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -254,7 +254,7 @@ function IceElement.prototype:FontFactory(size, frame, font, flags)
|
|||||||
fontString = font
|
fontString = font
|
||||||
end
|
end
|
||||||
|
|
||||||
fontString:SetFont(SML:Fetch(SML.MediaType.FONT, self.settings.fontFamily), size, flags)
|
fontString:SetFont(SML:Fetch('font', self.settings.fontFamily), size, flags)
|
||||||
if not (flags) then
|
if not (flags) then
|
||||||
fontString:SetShadowColor(0, 0, 0, 1)
|
fontString:SetShadowColor(0, 0, 0, 1)
|
||||||
fontString:SetShadowOffset(1, -1)
|
fontString:SetShadowOffset(1, -1)
|
||||||
|
@ -265,7 +265,7 @@ IceHUD.options =
|
|||||||
set = function(value)
|
set = function(value)
|
||||||
IceHUD.IceCore:SetFontFamily(value)
|
IceHUD.IceCore:SetFontFamily(value)
|
||||||
end,
|
end,
|
||||||
validate = SML:List(SML.MediaType.FONT),
|
validate = SML:List('font'),
|
||||||
},
|
},
|
||||||
|
|
||||||
barSettings = {
|
barSettings = {
|
||||||
|
@ -27,6 +27,7 @@ function CastBar.prototype:GetDefaultSettings()
|
|||||||
settings["lagAlpha"] = 0.7
|
settings["lagAlpha"] = 0.7
|
||||||
settings["showBlizzCast"] = false
|
settings["showBlizzCast"] = false
|
||||||
settings["shouldAnimate"] = false
|
settings["shouldAnimate"] = false
|
||||||
|
settings["usesDogTagStrings"] = false
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
|
@ -107,6 +107,7 @@ function ComboPoints.prototype:GetDefaultSettings()
|
|||||||
defaults["comboFontSize"] = 20
|
defaults["comboFontSize"] = 20
|
||||||
defaults["comboMode"] = "Numeric"
|
defaults["comboMode"] = "Numeric"
|
||||||
defaults["gradient"] = false
|
defaults["gradient"] = false
|
||||||
|
defaults["usesDogTagStrings"] = false
|
||||||
return defaults
|
return defaults
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -84,6 +84,7 @@ function FocusCC.prototype:GetDefaultSettings()
|
|||||||
settings["lowThreshold"] = 0
|
settings["lowThreshold"] = 0
|
||||||
settings["side"] = IceCore.Side.Left
|
settings["side"] = IceCore.Side.Left
|
||||||
settings["offset"] = 4
|
settings["offset"] = 4
|
||||||
|
settings["usesDogTagStrings"] = false
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
|
@ -65,6 +65,7 @@ function GlobalCoolDown.prototype:GetDefaultSettings()
|
|||||||
settings["desiredLerpTime"] = nil
|
settings["desiredLerpTime"] = nil
|
||||||
settings["lowThreshold"] = 0
|
settings["lowThreshold"] = 0
|
||||||
settings["barVisible"]["bg"] = false
|
settings["barVisible"]["bg"] = false
|
||||||
|
settings["usesDogTagStrings"] = false
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
|
@ -108,6 +108,7 @@ function LacerateCount.prototype:GetDefaultSettings()
|
|||||||
defaults["lacerateFontSize"] = 20
|
defaults["lacerateFontSize"] = 20
|
||||||
defaults["lacerateMode"] = "Numeric"
|
defaults["lacerateMode"] = "Numeric"
|
||||||
defaults["gradient"] = false
|
defaults["gradient"] = false
|
||||||
|
defaults["usesDogTagStrings"] = false
|
||||||
return defaults
|
return defaults
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -186,6 +186,7 @@ function MirrorBarHandler.prototype:GetDefaultSettings()
|
|||||||
settings["textVisible"] = {upper = true, lower = true}
|
settings["textVisible"] = {upper = true, lower = true}
|
||||||
settings["barVisible"] = {bg = true, bar = true}
|
settings["barVisible"] = {bg = true, bar = true}
|
||||||
settings["myTagVersion"] = 2
|
settings["myTagVersion"] = 2
|
||||||
|
settings["usesDogTagStrings"] = false
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
|
@ -65,6 +65,7 @@ function SliceAndDice.prototype:GetDefaultSettings()
|
|||||||
settings["upperText"]="SnD:"
|
settings["upperText"]="SnD:"
|
||||||
settings["showAsPercentOfMax"] = true
|
settings["showAsPercentOfMax"] = true
|
||||||
settings["durationAlpha"] = 0.6
|
settings["durationAlpha"] = 0.6
|
||||||
|
settings["usesDogTagStrings"] = false
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
|
@ -108,6 +108,7 @@ function SunderCount.prototype:GetDefaultSettings()
|
|||||||
defaults["sunderFontSize"] = 20
|
defaults["sunderFontSize"] = 20
|
||||||
defaults["sunderMode"] = "Numeric"
|
defaults["sunderMode"] = "Numeric"
|
||||||
defaults["gradient"] = false
|
defaults["gradient"] = false
|
||||||
|
defaults["usesDogTagStrings"] = false
|
||||||
return defaults
|
return defaults
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -90,6 +90,7 @@ function TargetCC.prototype:GetDefaultSettings()
|
|||||||
settings["lowThreshold"] = 0
|
settings["lowThreshold"] = 0
|
||||||
settings["side"] = IceCore.Side.Left
|
settings["side"] = IceCore.Side.Left
|
||||||
settings["offset"] = 3
|
settings["offset"] = 3
|
||||||
|
settings["usesDogTagStrings"] = false
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
|
@ -21,6 +21,7 @@ function TargetCast.prototype:GetDefaultSettings()
|
|||||||
settings["flashInstants"] = "Never"
|
settings["flashInstants"] = "Never"
|
||||||
settings["flashFailures"] = "Never"
|
settings["flashFailures"] = "Never"
|
||||||
settings["shouldAnimate"] = false
|
settings["shouldAnimate"] = false
|
||||||
|
settings["usesDogTagStrings"] = false
|
||||||
|
|
||||||
return settings
|
return settings
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user