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

Add ability to adjust strata globally

Browse Source 
Submitted by slowkerd from Curseforge (thanks!)
This commit is contained in:
Parnic
2023-08-02 08:16:12 -05:00
parent b32f090644
commit 40fc8187fd
24 changed files with 112 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
IceBarElement.lua
View File

@ -1040,7 +1040,8 @@ end
-- Creates the actual bar
function IceBarElement.prototype:CreateBar()
self.barFrame = self:BarFactory(self.barFrame, "LOW", "ARTWORK", "Bar")
self.barFrame = self:BarFactory(self.barFrame, IceHUD.IceCore:DetermineStrata("LOW"), "ARTWORK", "Bar")
self:SetBarCoord(self.barFrame)
self.barFrame.bar:SetBlendMode(self.settings.barBlendMode)
@ -1055,7 +1056,7 @@ function IceBarElement.prototype:BarFactory(barFrame, frameStrata, textureLayer,
barFrame = CreateFrame("Frame", "IceHUD_"..self.elementName.."_"..(nameSuffix or "Bar"), self.frame)
end
barFrame:SetFrameStrata(frameStrata and frameStrata or "LOW")
barFrame:SetFrameStrata(frameStrata and frameStrata or IceHUD.IceCore:DetermineStrata("LOW"))
barFrame:SetWidth(self.settings.barWidth + (self.moduleSettings.widthModifier or 0))
barFrame:SetHeight(self.settings.barHeight)
self:SetBarFramePoints(barFrame)

44
IceCore.lua
View File

@ -116,6 +116,8 @@ function IceCore.prototype:SetupDefaults()
bHideInBarberShop = true,
bHideDuringShellGame = true,
bHideDuringCataloging = true,
addedStrata = 0,
},
global = {
lastRunVersion = 0,
@ -931,6 +933,48 @@ function IceCore.prototype:SetColor(color, r, g, b)
self:Redraw()
end
function IceCore.prototype:GetAddedStrata()
return self.settings.addedStrata
end
function IceCore.prototype:SetAddedStrata(value)
self.settings.addedStrata = value
end
-- Preventing ugly if-else blocks in module creations
-- (but could probably itself be smarter/prettier)
-- Frisbees/AddonWhiner
function IceCore.prototype:DetermineStrata(baseStrata)
if self.settings.addedStrata == 0 then
return baseStrata
end
if self.settings.addedStrata == 1 then
if baseStrata == "BACKGROUND" then
return "LOW"
elseif baseStrata == "LOW" then
return "MEDIUM"
elseif baseStrata == "MEDIUM" then
return "HIGH"
elseif baseStrata == "HIGH" then
return "DIALOG"
end
end
if self.settings.addedStrata == 2 then
if baseStrata == "BACKGROUND" then
return "MEDIUM"
elseif baseStrata == "LOW" then
return "HIGH"
elseif baseStrata == "MEDIUM" then
return "DIALOG"
elseif baseStrata == "HIGH" then
return "FULLSCREEN"
end
end
return baseStrata -- failsafe
end
function IceCore.prototype:IsInConfigMode()
return self.bConfigMode

16
IceHUD_Options/Options.lua
View File

@ -444,6 +444,22 @@ The Classic game client doesn't provide this information to addons because it wa
hidden = not IceHUD.HasCataloging,
order = 36,
},
bIncreaseStrata = {
type = 'range',
name = L["Added strata"],
desc = L["Push IceHUD modules to the foreground. Increase if other addons are covering IceHUD. Requires reload."],
get = function()
return IceHUD.IceCore:GetAddedStrata()
end,
set = function(info, v)
IceHUD.IceCore:SetAddedStrata(v)
end,
min = 0,
max = 2,
step = 1,
order = 37,
},
}
},

5
changelog.md
View File

@ -1,5 +1,10 @@
# Changelog
v1.14.25:
- Fixed lua error that would appear when targetting webwrapped players in heroic alpha/beta titan rune dungeons.
- Added ability to adjust strata globally.
v1.14.24:
- Fixed an error when targeting a player and right-clicking a module that should show a menu in 10.1.5.

2
modules/CastBar.lua
View File

@ -426,7 +426,7 @@ end
function CastBar.prototype:CreateLagBar()
if self.lagBar == nil then
self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY", "Lag")
self.lagBar = self:BarFactory(self.lagBar, IceHUD.IceCore:DetermineStrata("LOW"), "OVERLAY", "Lag")
end
local r, g, b = self:GetColor("CastLag")

4
modules/ClassPowerCounter.lua
View File

@ -731,7 +731,7 @@ end
function IceClassPowerCounter.prototype:CreateFrame()
IceClassPowerCounter.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("LOW")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.frame:SetHeight(self.runeHeight)
self.frame:ClearAllPoints()
self.frame:SetPoint("TOP", self.parent, "BOTTOM", self.moduleSettings.hpos, self.moduleSettings.vpos)
@ -807,7 +807,7 @@ function IceClassPowerCounter.prototype:CreateRune(i)
-- create runes
if (not self.frame.graphical[i]) then
self.frame.graphical[i] = CreateFrame("Frame", nil, self.frame)
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i].rune = self.frame.graphical[i]:CreateTexture(nil, "BORDER")
self.frame.graphical[i].rune:SetVertexColor(0, 0, 0)

8
modules/ComboPoints.lua
View File

@ -337,7 +337,7 @@ end
function ComboPoints.prototype:CreateFrame()
ComboPoints.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.graphicalLayout == "Horizontal" then
self.frame:SetWidth((self.comboSize - 5)*self:GetMaxComboPoints())
self.frame:SetHeight(1)
@ -396,7 +396,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end
end
self.frame.graphicalBG[i]:SetFrameStrata("BACKGROUND")
self.frame.graphicalBG[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphicalBG[i]:SetWidth(self.comboSize)
self.frame.graphicalBG[i]:SetHeight(self.comboSize)
if self.moduleSettings.graphicalLayout == "Horizontal" then
@ -432,7 +432,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end
end
self.frame.graphical[i]:SetFrameStrata("LOW")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.frame.graphical[i]:SetAllPoints(self.frame.graphicalBG[i])
local r, g, b = self:GetColor("ComboPoints")
@ -471,7 +471,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end
end
self.frame.graphicalAnt[i]:SetFrameStrata("LOW")
self.frame.graphicalAnt[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.frame.graphicalAnt[i]:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel() + 1)
self.frame.graphicalAnt[i]:SetWidth(math.floor(self.comboSize / 2))
self.frame.graphicalAnt[i]:SetHeight(math.floor(self.comboSize / 2))

6
modules/CustomCount.lua
View File

@ -326,7 +326,7 @@ end
function IceCustomCount.prototype:CreateFrame()
IceCustomCount.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.graphicalLayout == "Horizontal" then
self.frame:SetWidth((self.countSize + self.moduleSettings.countGap)*IceStackCounter_GetMaxCount(self))
self.frame:SetHeight(1)
@ -382,7 +382,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
end
end
self.frame.graphicalBG[i]:SetFrameStrata("BACKGROUND")
self.frame.graphicalBG[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphicalBG[i]:SetWidth(self.countSize)
self.frame.graphicalBG[i]:SetHeight(self.countSize)
if self.moduleSettings.graphicalLayout == "Horizontal" then
@ -416,7 +416,7 @@ function IceCustomCount.prototype:CreateCustomFrame(doTextureUpdate)
end
end
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i]:SetAllPoints(self.frame.graphicalBG[i])
self.frame.graphical[i]:Hide()

2
modules/EclipseBar.lua
View File

@ -107,7 +107,7 @@ function EclipseBar.prototype:CreateFrame()
end
function EclipseBar.prototype:CreateSolarBar()
self.solarBar = self:BarFactory(self.solarBar,"BACKGROUND", "ARTWORK", "Solar")
self.solarBar = self:BarFactory(self.solarBar, IceHUD.IceCore:DetermineStrata("BACKGROUND"), "ARTWORK", "Solar")
self:SetBarCoord(self.solarBar, 0.5, true)
self.solarBar.bar:SetVertexColor(self:GetColor("EclipseSolar", 1))

4
modules/FocusHealth.lua
View File

@ -422,9 +422,9 @@ end
function FocusHealth.prototype:UpdateRaidFocusIcon()
if self.moduleSettings.raidIconOnTop then
self.frame.raidIcon:SetFrameStrata("MEDIUM")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
else
self.frame.raidIcon:SetFrameStrata("LOW")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
end
if not (UnitExists(self.unit)) or not self.moduleSettings.showRaidIcon then

4
modules/GlobalCoolDown.lua
View File

@ -38,7 +38,7 @@ function GlobalCoolDown.prototype:Enable(core)
self:Show(false)
self.frame:SetFrameStrata("LOW")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
self.CDSpellId = self:GetSpellId()
end
@ -255,7 +255,7 @@ function GlobalCoolDown.prototype:CreateFrame()
end
function GlobalCoolDown.prototype:CreateLagBar()
self.lagBar = self:BarFactory(self.lagBar, "LOW", "OVERLAY", "Lag")
self.lagBar = self:BarFactory(self.lagBar, IceHUD.IceCore:DetermineStrata("LOW"), "OVERLAY", "Lag")
local r, g, b = self:GetColor("CastLag")
if (self.settings.backgroundToggle) then

4
modules/PlayerHealth.lua
View File

@ -933,7 +933,7 @@ function PlayerHealth.prototype:CreateBackground(redraw)
end
function PlayerHealth.prototype:CreateHealBar()
self.healFrame = self:BarFactory(self.healFrame, "LOW","BACKGROUND", "Heal")
self.healFrame = self:BarFactory(self.healFrame, IceHUD.IceCore:DetermineStrata("LOW"),"BACKGROUND", "Heal")
self.healFrame.bar:SetVertexColor(self:GetColor("PlayerHealthHealAmount", self.alpha * self.moduleSettings.healAlpha))
@ -945,7 +945,7 @@ function PlayerHealth.prototype:CreateHealBar()
end
function PlayerHealth.prototype:CreateAbsorbBar()
self.absorbFrame = self:BarFactory(self.absorbFrame, "LOW","BACKGROUND", "Absorb")
self.absorbFrame = self:BarFactory(self.absorbFrame, IceHUD.IceCore:DetermineStrata("LOW"),"BACKGROUND", "Absorb")
self.absorbFrame.bar:SetVertexColor(self:GetColor("PlayerHealthAbsorbAmount", self.alpha * self.moduleSettings.absorbAlpha))

2
modules/PlayerMana.lua
View File

@ -475,7 +475,7 @@ function PlayerMana.prototype:CreateTickerFrame()
self.tickerFrame = CreateFrame("Frame", nil, self.barFrame)
end
self.tickerFrame:SetFrameStrata("BACKGROUND")
self.tickerFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.tickerFrame:SetWidth(self.settings.barWidth)
self.tickerFrame:SetHeight(self.settings.barHeight)

2
modules/RangeCheck.lua
View File

@ -126,7 +126,7 @@ function RangeCheck.prototype:CreateFrame(redraw)
end
self.frame:SetScale(self.moduleSettings.scale)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(200)
self.frame:SetHeight(32)
self.frame:ClearAllPoints()

2
modules/RollTheBones.lua
View File

@ -199,7 +199,7 @@ function RollTheBones.prototype:CreateDurationBar()
return
end
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
self.durationFrame = self:BarFactory(self.durationFrame, IceHUD.IceCore:DetermineStrata("BACKGROUND"),"ARTWORK", "Duration")
-- Rokiyo: Do we need to call this here?
self.CurrScale = 0

6
modules/Runes.lua
View File

@ -456,7 +456,7 @@ end
function Runes.prototype:CreateFrame()
Runes.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.runeSize*self.numRunes)
self.frame:SetHeight(1)
self.frame:ClearAllPoints()
@ -516,7 +516,7 @@ function Runes.prototype:CreateRune(i, type, name)
self.frame.graphical[i].shine = self.frame.graphical[i]:CreateTexture(nil, "OVERLAY")
end
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i]:SetWidth(self.runeSize)
self.frame.graphical[i]:SetHeight(self.runeSize)
@ -546,7 +546,7 @@ function Runes.prototype:CreateRune(i, type, name)
self.frame.graphical[i]:Hide()
end
self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
self.frame.graphical[i].cd:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
self.frame.graphical[i].cd:ClearAllPoints()
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])

2
modules/SliceAndDice.lua
View File

@ -214,7 +214,7 @@ function SliceAndDice.prototype:CreateFrame()
end
function SliceAndDice.prototype:CreateDurationBar()
self.durationFrame = self:BarFactory(self.durationFrame, "BACKGROUND","ARTWORK", "Duration")
self.durationFrame = self:BarFactory(self.durationFrame, IceHUD.IceCore:DetermineStrata("BACKGROUND"),"ARTWORK", "Duration")
-- Rokiyo: Do we need to call this here?
self.CurrScale = 0

2
modules/Stagger.lua
View File

@ -137,7 +137,7 @@ function StaggerBar.prototype:CreateFrame()
end
function StaggerBar.prototype:CreateTimerBar()
self.timerFrame = self:BarFactory(self.timerFrame, "MEDIUM","ARTWORK", "Timer")
self.timerFrame = self:BarFactory(self.timerFrame, IceHUD.IceCore:DetermineStrata("MEDIUM"),"ARTWORK", "Timer")
self.CurrScale = 0

4
modules/TargetHealth.lua
View File

@ -984,9 +984,9 @@ end
function IceTargetHealth.prototype:UpdateRaidTargetIcon()
if self.moduleSettings.raidIconOnTop then
self.frame.raidIcon:SetFrameStrata("MEDIUM")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("MEDIUM"))
else
self.frame.raidIcon:SetFrameStrata("LOW")
self.frame.raidIcon:SetFrameStrata(IceHUD.IceCore:DetermineStrata("LOW"))
end
if not self.moduleSettings.showRaidIcon or (not UnitExists(self.unit) and (not self.configMode and not IceHUD.IceCore:IsInConfigMode())) then

6
modules/TargetInfo.lua
View File

@ -1136,7 +1136,7 @@ do -- OVERRIDE: IceTargetInfo.prototype:CreateFrame(redraw)
self.frame:SetScale(self.moduleSettings.scale)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.width)
self.frame:SetHeight(32)
self.frame:ClearAllPoints()
@ -1220,7 +1220,7 @@ function IceTargetInfo.prototype:CreateAuraFrame(aura, redraw)
if (not self.frame[auraFrame]) then
self.frame[auraFrame] = CreateFrame("Frame", nil, self.frame)
self.frame[auraFrame]:SetFrameStrata("BACKGROUND")
self.frame[auraFrame]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame[auraFrame]:SetWidth(1)
self.frame[auraFrame]:SetHeight(1)
self.frame[auraFrame]:Show()
@ -1244,7 +1244,7 @@ end
do
local function FrameFactory(frameType, parentFrame, inheritsFrame)
local frame = CreateFrame(frameType, nil, parentFrame, inheritsFrame)
frame:SetFrameStrata("BACKGROUND")
frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
frame:ClearAllPoints()
return frame
end

8
modules/TargetOfTarget.lua
View File

@ -314,7 +314,7 @@ function TargetOfTarget.prototype:CreateFrame()
self.frame:SetAttribute("unit", self.unit)
end
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.sizeToGap then
self.frame:SetWidth(self.settings.gap)
else
@ -368,7 +368,7 @@ function TargetOfTarget.prototype:CreateBarFrame()
self.frame.bg:SetTexture(0,0,0)
self.frame.bar:SetFrameStrata("BACKGROUND")
self.frame.bar:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
if self.moduleSettings.sizeToGap then
self.frame.bg:SetWidth(self.settings.gap + 2)
self.frame.bar:SetWidth(self.settings.gap)
@ -435,7 +435,7 @@ function TargetOfTarget.prototype:CreateDebuffFrame()
end
self.frame.debuffFrame = CreateFrame("Frame", nil, self.frame)
self.frame.debuffFrame:SetFrameStrata("BACKGROUND")
self.frame.debuffFrame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.debuffFrame:SetWidth(10)
self.frame.debuffFrame:SetHeight(self.height)
@ -451,7 +451,7 @@ function TargetOfTarget.prototype:CreateIconFrames(parent)
for i = 1, IceCore.BuffLimit do
buffs[i] = CreateFrame("Frame", nil, parent)
buffs[i]:SetFrameStrata("BACKGROUND")
buffs[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
buffs[i]:SetWidth(self.buffSize)
buffs[i]:SetHeight(self.buffSize)
buffs[i]:SetPoint("LEFT", (i-1) * self.buffSize + (i-1), 0)

4
modules/Threat.lua
View File

@ -231,7 +231,7 @@ end
-- create the aggro range indicator bar
function IceThreat.prototype:CreateAggroBar()
self.aggroBar = self:BarFactory(self.aggroBar, "BACKGROUND","ARTWORK", "Aggro")
self.aggroBar = self:BarFactory(self.aggroBar, IceHUD.IceCore:DetermineStrata("BACKGROUND"), "ARTWORK", "Aggro")
local r, g, b = self:GetColor("ThreatPullAggro")
if (self.settings.backgroundToggle) then
@ -243,7 +243,7 @@ function IceThreat.prototype:CreateAggroBar()
end
function IceThreat.prototype:CreateSecondThreatBar()
self.secondThreatBar = self:BarFactory(self.secondThreatBar, "MEDIUM", "OVERLAY", "SecondThreat")
self.secondThreatBar = self:BarFactory(self.secondThreatBar, IceHUD.IceCore:DetermineStrata("MEDIUM"), "OVERLAY", "SecondThreat")
self.secondThreatBar.bar:SetVertexColor(self:GetColor("ThreatSecondPlace", self.alpha * self.moduleSettings.secondPlaceThreatAlpha))

6
modules/Totems.lua
View File

@ -265,7 +265,7 @@ end
function Totems.prototype:CreateFrame()
Totems.super.prototype.CreateFrame(self)
self.frame:SetFrameStrata("BACKGROUND")
self.frame:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame:SetWidth(self.totemSize*self.numTotems)
self.frame:SetHeight(1)
self.frame:ClearAllPoints()
@ -349,7 +349,7 @@ function Totems.prototype:CreateTotem(i, name)
self.frame.graphical[i].totem:SetAllPoints(self.frame.graphical[i])
end
self.frame.graphical[i]:SetFrameStrata("BACKGROUND")
self.frame.graphical[i]:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i]:SetWidth(self.totemSize)
self.frame.graphical[i]:SetHeight(self.totemSize)
@ -380,7 +380,7 @@ function Totems.prototype:CreateTotem(i, name)
end
end
self.frame.graphical[i].cd:SetFrameStrata("BACKGROUND")
self.frame.graphical[i].cd:SetFrameStrata(IceHUD.IceCore:DetermineStrata("BACKGROUND"))
self.frame.graphical[i].cd:SetFrameLevel(self.frame.graphical[i]:GetFrameLevel()+1)
self.frame.graphical[i].cd:ClearAllPoints()
self.frame.graphical[i].cd:SetAllPoints(self.frame.graphical[i])

5
this_version.md
View File

@ -1,5 +1,10 @@
# Changelog
v1.14.25:
- Fixed lua error that would appear when targetting webwrapped players in heroic alpha/beta titan rune dungeons.
- Added ability to adjust strata globally.
v1.14.24:
- Fixed an error when targeting a player and right-clicking a module that should show a menu in 10.1.5.