- fixed text display for non-dogtag strings

This commit is contained in:
Parnic
2008-06-19 02:38:29 +00:00
parent fd7162b4ef
commit 9b1db346ac
13 changed files with 16 additions and 5 deletions

View File

@ -55,7 +55,7 @@ end
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
DogTag:AddFontString(self.frame.bottomUpperText, self.frame, self.moduleSettings.upperText, "Unit", { unit = self.unit })
end
@ -86,6 +86,7 @@ function IceBarElement.prototype:GetDefaultSettings()
settings["barVisible"] = {bg = true, bar = true}
settings["myTagVersion"] = 2
settings["widthModifier"] = 0
settings["usesDogTagStrings"] = true
return settings
end
@ -710,7 +711,7 @@ function IceBarElement.prototype:UpdateBar(scale, color, alpha)
self.barFrame:Show()
end
if DogTag ~= nil then
if DogTag ~= nil and self.moduleSettings.usesDogTagStrings then
DogTag:UpdateAllForFrame(self.frame)
self:SetTextAlpha()
end
@ -746,7 +747,7 @@ function IceBarElement.prototype:SetBottomText1(text, color)
if (self.moduleSettings.lockUpperTextAlpha and (self.alpha > 0)) then
alpha = 1
end
self.frame.bottomUpperText:SetText(text)
end

View File

@ -254,7 +254,7 @@ function IceElement.prototype:FontFactory(size, frame, font, flags)
fontString = font
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
fontString:SetShadowColor(0, 0, 0, 1)
fontString:SetShadowOffset(1, -1)

View File

@ -265,7 +265,7 @@ IceHUD.options =
set = function(value)
IceHUD.IceCore:SetFontFamily(value)
end,
validate = SML:List(SML.MediaType.FONT),
validate = SML:List('font'),
},
barSettings = {

View File

@ -27,6 +27,7 @@ function CastBar.prototype:GetDefaultSettings()
settings["lagAlpha"] = 0.7
settings["showBlizzCast"] = false
settings["shouldAnimate"] = false
settings["usesDogTagStrings"] = false
return settings
end

View File

@ -107,6 +107,7 @@ function ComboPoints.prototype:GetDefaultSettings()
defaults["comboFontSize"] = 20
defaults["comboMode"] = "Numeric"
defaults["gradient"] = false
defaults["usesDogTagStrings"] = false
return defaults
end

View File

@ -84,6 +84,7 @@ function FocusCC.prototype:GetDefaultSettings()
settings["lowThreshold"] = 0
settings["side"] = IceCore.Side.Left
settings["offset"] = 4
settings["usesDogTagStrings"] = false
return settings
end

View File

@ -65,6 +65,7 @@ function GlobalCoolDown.prototype:GetDefaultSettings()
settings["desiredLerpTime"] = nil
settings["lowThreshold"] = 0
settings["barVisible"]["bg"] = false
settings["usesDogTagStrings"] = false
return settings
end

View File

@ -108,6 +108,7 @@ function LacerateCount.prototype:GetDefaultSettings()
defaults["lacerateFontSize"] = 20
defaults["lacerateMode"] = "Numeric"
defaults["gradient"] = false
defaults["usesDogTagStrings"] = false
return defaults
end

View File

@ -186,6 +186,7 @@ function MirrorBarHandler.prototype:GetDefaultSettings()
settings["textVisible"] = {upper = true, lower = true}
settings["barVisible"] = {bg = true, bar = true}
settings["myTagVersion"] = 2
settings["usesDogTagStrings"] = false
return settings
end

View File

@ -65,6 +65,7 @@ function SliceAndDice.prototype:GetDefaultSettings()
settings["upperText"]="SnD:"
settings["showAsPercentOfMax"] = true
settings["durationAlpha"] = 0.6
settings["usesDogTagStrings"] = false
return settings
end

View File

@ -108,6 +108,7 @@ function SunderCount.prototype:GetDefaultSettings()
defaults["sunderFontSize"] = 20
defaults["sunderMode"] = "Numeric"
defaults["gradient"] = false
defaults["usesDogTagStrings"] = false
return defaults
end

View File

@ -90,6 +90,7 @@ function TargetCC.prototype:GetDefaultSettings()
settings["lowThreshold"] = 0
settings["side"] = IceCore.Side.Left
settings["offset"] = 3
settings["usesDogTagStrings"] = false
return settings
end

View File

@ -21,6 +21,7 @@ function TargetCast.prototype:GetDefaultSettings()
settings["flashInstants"] = "Never"
settings["flashFailures"] = "Never"
settings["shouldAnimate"] = false
settings["usesDogTagStrings"] = false
return settings
end