Exiles/coa-elvui
3
0
Fork 0
Code Pull Requests Actions Packages Releases 1 Wiki Activity

Revert "HealComm: Add toggle for Absorbs and reduce redundant updates (#94)"

Browse Source 
This reverts commit 5ee511181e.
This commit is contained in:
andrew6180
2025-12-24 18:11:09 -07:00
parent 9410c29836
commit dcdf241d6a
7 changed files with 37 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Core/ReversibleStatusBar.lua
+9 -17
View File
@@ -100,8 +100,6 @@ local reversibleBar = setmetatable({
"Usage: StatusBar:SetMinMaxValues(number, number)"
)
if self.MINVALUE == minValue and self.MAXVALUE == maxValue then return end
if maxValue > minValue then
self.MINVALUE = minValue
self.MAXVALUE = maxValue
@@ -124,7 +122,6 @@ local reversibleBar = setmetatable({
SetValue = function(self, value)
assert(type(value) == "number", "Usage: StatusBar:SetValue(number)")
if WithinRange(value, self.MINVALUE, self.MAXVALUE) then
if self.VALUE == value then return end
self.VALUE = value
reversibleBar_Update(self)
end
@@ -134,7 +131,6 @@ local reversibleBar = setmetatable({
end,
SetOrientation = function(self, orientation)
if orientation == "HORIZONTAL" or orientation == "VERTICAL" then
if self.ORIENTATION == orientation then return end
self.ORIENTATION = orientation
reversibleBar_Update(self)
end
@@ -143,18 +139,14 @@ local reversibleBar = setmetatable({
return self.ORIENTATION
end,
SetRotatesTexture = function(self, rotate)
local newRotate = (rotate ~= nil and rotate ~= false)
if self.ROTATE == newRotate then return end
self.ROTATE = newRotate
self.ROTATE = (rotate ~= nil and rotate ~= false)
reversibleBar_Update(self)
end,
GetRotatesTexture = function(self)
return self.ROTATE
end,
SetReverseFill = function(self, reverse)
local newReverse = (reverse == true)
if self.REVERSE == newReverse then return end
self.REVERSE = newReverse
self.REVERSE = (reverse == true)
reversibleBar_Update(self)
end,
GetReverseFill = function(self)
@@ -162,16 +154,16 @@ local reversibleBar = setmetatable({
end,
SetFillStyle = function(self, style)
assert(type(style) == "string" or style == nil, "Usage: StatusBar:SetFillStyle(string)")
local newStyle = "STANDARD"
if style and style:lower() == "center" then
newStyle = "CENTER"
self.FILLSTYLE = "CENTER"
reversibleBar_Update(self)
elseif style and style:lower() == "reverse" then
newStyle = "REVERSE"
self.FILLSTYLE = "REVERSE"
reversibleBar_Update(self)
else
self.FILLSTYLE = "STANDARD"
reversibleBar_Update(self)
end
if self.FILLSTYLE == newStyle then return end
self.FILLSTYLE = newStyle
reversibleBar_Update(self)
end,
GetFillStyle = function(self)
return self.FILLSTYLE
ElvUI/Libraries/oUF_Plugins/oUF_HealComm4/oUF_HealComm4.lua
+12 -46
View File
@@ -55,7 +55,6 @@ local UnitName = UnitName
local UnitGetIncomingHeals = UnitGetIncomingHeals
local UnitGetTotalAbsorbs = UnitGetTotalAbsorbs
local UnitGetTotalHealAbsorbs = UnitGetTotalHealAbsorbs
local GetTime = GetTime
local enabledUF, enabled = {}, nil
@@ -63,13 +62,6 @@ local function Update(self)
local unit = self.unit
local element = self.HealCommBar
local now = GetTime()
local lastUpdate = element.lastUpdate or 0
if now - lastUpdate < 0.05 then
return
end
element.lastUpdate = now
--[[ Callback: HealthPrediction:PreUpdate(unit)
Called before the element has been updated.
@@ -82,8 +74,8 @@ local function Update(self)
local myIncomingHeal = UnitGetIncomingHeals(unit, UnitName("player")) or 0
local allIncomingHeal = UnitGetIncomingHeals(unit) or 0
local absorb = (element.absorbs and UnitGetTotalAbsorbs and UnitGetTotalAbsorbs(unit)) or 0
local healAbsorb = (element.absorbs and UnitGetTotalHealAbsorbs and UnitGetTotalHealAbsorbs(unit)) or 0
local absorb = UnitGetTotalAbsorbs and UnitGetTotalAbsorbs(unit) or 0
local healAbsorb = UnitGetTotalHealAbsorbs and UnitGetTotalHealAbsorbs(unit) or 0
local health = UnitHealth(unit)
local maxHealth = UnitHealthMax(unit)
local maxOverflowHP = maxHealth * element.maxOverflow
@@ -118,48 +110,32 @@ local function Update(self)
end
if element.myBar then
if element.maxHealth ~= maxHealth then
element.myBar:SetMinMaxValues(0, maxHealth)
end
element.myBar:SetMinMaxValues(0, maxHealth)
element.myBar:SetValue(myIncomingHeal)
element.myBar:Show()
end
if element.otherBar then
if element.maxHealth ~= maxHealth then
element.otherBar:SetMinMaxValues(0, maxHealth)
end
element.otherBar:SetMinMaxValues(0, maxHealth)
element.otherBar:SetValue(otherIncomingHeal)
element.otherBar:Show()
end
if element.absorbBar then
if element.absorbs then
if element.maxHealth ~= maxHealth then
element.absorbBar:SetMinMaxValues(0, maxHealth)
end
element.absorbBar:SetValue(absorb)
if absorb > 0 then
element.absorbBar:Show()
else
element.absorbBar:Hide()
end
element.absorbBar:SetMinMaxValues(0, maxHealth)
element.absorbBar:SetValue(absorb)
if absorb > 0 then
element.absorbBar:Show()
else
element.absorbBar:Hide()
end
end
if element.healAbsorbBar then
if element.absorbs then
if element.maxHealth ~= maxHealth then
element.healAbsorbBar:SetMinMaxValues(0, maxHealth)
end
element.healAbsorbBar:SetValue(healAbsorb)
if healAbsorb > 0 then
element.healAbsorbBar:Show()
else
element.healAbsorbBar:Hide()
end
element.healAbsorbBar:SetMinMaxValues(0, maxHealth)
element.healAbsorbBar:SetValue(healAbsorb)
if healAbsorb > 0 then
element.healAbsorbBar:Show()
else
element.healAbsorbBar:Hide()
end
@@ -178,8 +154,6 @@ local function Update(self)
if element.PostUpdate then
return element:PostUpdate(unit, myIncomingHeal, otherIncomingHeal, absorb, healAbsorb)
end
element.maxHealth = maxHealth
end
local function Path(self, ...)
@@ -231,14 +205,6 @@ local function Enable(self)
element.maxOverflow = 1.05
end
if element.myBar and element.myBar:IsObjectType("StatusBar") and not element.myBar:GetStatusBarTexture() then
element.myBar:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]])
end
if element.otherBar and element.otherBar:IsObjectType("StatusBar") and not element.otherBar:GetStatusBarTexture() then
element.otherBar:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]])
end
if element.absorbBar and element.absorbBar:IsObjectType("StatusBar") and not element.absorbBar:GetStatusBarTexture() then
element.absorbBar:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]])
end
ElvUI/Modules/Nameplates/Elements/Health.lua
+3 -38
View File
@@ -135,7 +135,7 @@ end
function NP:Update_HealComm(nameplate)
local db = NP:PlateDB(nameplate)
if db.health.enable and db.health.healPrediction and db.health.healPrediction.enable then
if db.health.enable and db.health.healPrediction then
if not nameplate:IsElementEnabled('HealCommBar') then
nameplate:EnableElement('HealCommBar')
end
@@ -232,15 +232,6 @@ function NP:Construct_HealComm(frame)
absorbBar:SetStatusBarTexture(texture)
healAbsorbBar:SetStatusBarTexture(texture)
myBar:SetMinMaxValues(0, 1)
myBar:SetValue(0)
otherBar:SetMinMaxValues(0, 1)
otherBar:SetValue(0)
absorbBar:SetMinMaxValues(0, 1)
absorbBar:SetValue(0)
healAbsorbBar:SetMinMaxValues(0, 1)
healAbsorbBar:SetValue(0)
local healPrediction = {
myBar = myBar,
otherBar = otherBar,
@@ -276,7 +267,6 @@ function NP:Configure_HealComm(frame)
healPrediction.maxOverflow = 1 + (c.maxOverflow or 0)
healPrediction.overflowHeals = c.overflowHeals
healPrediction.overflowAbsorbs = c.overflowAbsorbs
healPrediction.absorbs = frame.db.healPrediction.absorbs
if healPrediction.allowClippingUpdate then
NP:SetVisibility_HealComm(healPrediction)
@@ -299,13 +289,6 @@ function NP:Configure_HealComm(frame)
absorbBar:SetOrientation(orientation)
healAbsorbBar:SetOrientation(orientation)
healPrediction.cachedOrientation = orientation
myBar._anchorState = nil
otherBar._anchorState = nil
absorbBar._anchorState = nil
healAbsorbBar._anchorState = nil
if orientation == "HORIZONTAL" then
local p1 = "LEFT"
local p2 = "RIGHT"
@@ -381,26 +364,12 @@ function NP:Configure_HealComm(frame)
frame.HealCommBar.otherBar:SetStatusBarColor(hpc.others.r, hpc.others.g, hpc.others.b)
frame.HealCommBar.absorbBar:SetStatusBarColor(hpc.absorbs.r, hpc.absorbs.g, hpc.absorbs.b, hpc.absorbs.a)
frame.HealCommBar.healAbsorbBar:SetStatusBarColor(hpc.healAbsorbs.r, hpc.healAbsorbs.g, hpc.healAbsorbs.b, hpc.healAbsorbs.a)
if not healPrediction.absorbs then
absorbBar:Hide()
healAbsorbBar:Hide()
end
elseif frame:IsElementEnabled('HealComm4') then
frame:DisableElement('HealComm4')
end
end
local function AnchorPredictionBar(bar, health, orientation, anchorTexture, hasEnoughSpace, overflowMode, p1, p2, reverseAnchorTexture)
local needsReverse = not overflowMode and not hasEnoughSpace
local anchorKey = orientation .. (overflowMode and "O" or (hasEnoughSpace and "E" or "R"))
if bar._anchorState == anchorKey and bar._reverseFill == needsReverse then
return
end
bar._anchorState = anchorKey
bar._reverseFill = needsReverse
bar:ClearAllPoints()
if orientation == "HORIZONTAL" then
@@ -428,11 +397,8 @@ function NP:UpdateHealComm(unit, myIncomingHeal, allIncomingHeal, totalAbsorb, m
if not self.frame or not self.health then return end
local health = self.health
local healthTexture = self.healthBarTexture
if not healthTexture then
healthTexture = health:GetStatusBarTexture()
self.healthBarTexture = healthTexture
end
local healthTexture = self.healthBarTexture or health:GetStatusBarTexture()
local orientation = health:GetOrientation()
local currentHealth = UnitHealth(unit) or 0
local maxHealth = UnitHealthMax(unit) or 1
@@ -440,7 +406,6 @@ function NP:UpdateHealComm(unit, myIncomingHeal, allIncomingHeal, totalAbsorb, m
local otherIncomingHeal = allIncomingHeal - myIncomingHeal
local totalIncomingHeal = myIncomingHeal + otherIncomingHeal
local orientation = self.cachedOrientation or health:GetOrientation()
local p1 = self.anchor1 or (orientation == "HORIZONTAL" and "LEFT" or "BOTTOM")
local p2 = self.anchor2 or (orientation == "HORIZONTAL" and "RIGHT" or "TOP")
ElvUI/Modules/UnitFrames/Elements/HealComm.lua
+2 -37
View File
@@ -61,15 +61,6 @@ function UF:Construct_HealComm(frame)
absorbBar:SetStatusBarTexture(texture)
healAbsorbBar:SetStatusBarTexture(texture)
myBar:SetMinMaxValues(0, 1)
myBar:SetValue(0)
otherBar:SetMinMaxValues(0, 1)
otherBar:SetValue(0)
absorbBar:SetMinMaxValues(0, 1)
absorbBar:SetValue(0)
healAbsorbBar:SetMinMaxValues(0, 1)
healAbsorbBar:SetValue(0)
local healPrediction = {
myBar = myBar,
otherBar = otherBar,
@@ -99,7 +90,6 @@ function UF:Configure_HealComm(frame)
healPrediction.maxOverflow = 1 + (c.maxOverflow or 0)
healPrediction.overflowHeals = c.overflowHeals
healPrediction.overflowAbsorbs = c.overflowAbsorbs
healPrediction.absorbs = frame.db.healPrediction.absorbs
if healPrediction.allowClippingUpdate then
UF:SetVisibility_HealComm(healPrediction)
@@ -127,13 +117,6 @@ function UF:Configure_HealComm(frame)
absorbBar:SetOrientation(orientation)
healAbsorbBar:SetOrientation(orientation)
healPrediction.cachedOrientation = orientation
myBar._anchorState = nil
otherBar._anchorState = nil
absorbBar._anchorState = nil
healAbsorbBar._anchorState = nil
if orientation == "HORIZONTAL" then
local p1 = "LEFT"
local p2 = "RIGHT"
@@ -209,26 +192,12 @@ function UF:Configure_HealComm(frame)
otherBar:SetStatusBarColor(c.others.r, c.others.g, c.others.b, c.others.a)
absorbBar:SetStatusBarColor(c.absorbs.r, c.absorbs.g, c.absorbs.b, c.absorbs.a)
healAbsorbBar:SetStatusBarColor(c.healAbsorbs.r, c.healAbsorbs.g, c.healAbsorbs.b, c.healAbsorbs.a)
if not healPrediction.absorbs then
absorbBar:Hide()
healAbsorbBar:Hide()
end
elseif frame:IsElementEnabled("HealComm4") then
frame:DisableElement("HealComm4")
end
end
local function AnchorPredictionBar(bar, health, orientation, anchorTexture, hasEnoughSpace, overflowMode, p1, p2, reverseAnchorTexture)
local needsReverse = not overflowMode and not hasEnoughSpace
local anchorKey = orientation .. (overflowMode and "O" or (hasEnoughSpace and "E" or "R"))
if bar._anchorState == anchorKey and bar._reverseFill == needsReverse then
return
end
bar._anchorState = anchorKey
bar._reverseFill = needsReverse
bar:ClearAllPoints()
if orientation == "HORIZONTAL" then
@@ -256,11 +225,8 @@ function UF:UpdateHealComm(unit, myIncomingHeal, allIncomingHeal, totalAbsorb, m
if not self.frame or not self.health then return end
local health = self.health
local healthTexture = self.healthBarTexture
if not healthTexture then
healthTexture = health:GetStatusBarTexture()
self.healthBarTexture = healthTexture
end
local healthTexture = self.healthBarTexture or health:GetStatusBarTexture()
local orientation = health:GetOrientation()
local currentHealth = UnitHealth(unit) or 0
local maxHealth = UnitHealthMax(unit) or 1
@@ -268,7 +234,6 @@ function UF:UpdateHealComm(unit, myIncomingHeal, allIncomingHeal, totalAbsorb, m
local otherIncomingHeal = allIncomingHeal - myIncomingHeal
local totalIncomingHeal = myIncomingHeal + otherIncomingHeal
local orientation = self.cachedOrientation or health:GetOrientation()
local p1 = self.anchor1 or (orientation == "HORIZONTAL" and "LEFT" or "BOTTOM")
local p2 = self.anchor2 or (orientation == "HORIZONTAL" and "RIGHT" or "TOP")
ElvUI/Settings/Profile.lua
+9 -20
View File
@@ -304,10 +304,7 @@ local NP_Auras = {
local NP_Health = {
enable = true,
healPrediction = {
enable = true,
absorbs = false,
},
healPrediction = true,
height = 10,
useClassColor = true,
text = {
@@ -1169,8 +1166,7 @@ P.unitframe = {
height = 54,
lowmana = 30,
healPrediction = {
enable = true,
absorbs = true,
enable = true
},
threatStyle = "GLOW",
smartAuraPosition = "DISABLED",
@@ -1453,8 +1449,7 @@ P.unitframe = {
smartAuraPosition = "DISABLED",
colorOverride = "USE_DEFAULT",
healPrediction = {
enable = true,
absorbs = false,
enable = true
},
middleClickFocus = true,
disableMouseoverGlow = false,
@@ -1913,8 +1908,7 @@ P.unitframe = {
width = 190,
height = 36,
healPrediction = {
enable = true,
absorbs = false,
enable = true
},
disableMouseoverGlow = false,
disableTargetGlow = false,
@@ -2214,8 +2208,7 @@ P.unitframe = {
width = 130,
height = 36,
healPrediction = {
enable = true,
absorbs = false,
enable = true
},
disableMouseoverGlow = false,
disableTargetGlow = true,
@@ -2650,8 +2643,7 @@ P.unitframe = {
width = 246,
height = 47,
healPrediction = {
enable = true,
absorbs = false,
enable = true
},
colorOverride = "USE_DEFAULT",
disableMouseoverGlow = false,
@@ -2813,8 +2805,7 @@ P.unitframe = {
startFromCenter = false,
showPlayer = true,
healPrediction = {
enable = true,
absorbs = false,
enable = true
},
colorOverride = "USE_DEFAULT",
width = 184,
@@ -3083,8 +3074,7 @@ P.unitframe = {
sortDir = "ASC",
showPlayer = true,
healPrediction = {
enable = true,
absorbs = false,
enable = true
},
colorOverride = "USE_DEFAULT",
width = 80,
@@ -3281,8 +3271,7 @@ P.unitframe = {
sortDir = "ASC",
showPlayer = true,
healPrediction = {
enable = true,
absorbs = false,
enable = true
},
colorOverride = "USE_DEFAULT",
width = 80,
ElvUI_OptionsUI/Nameplates.lua
+1 -5
View File
@@ -76,11 +76,7 @@ local function GetUnitSettings(unit, name)
group.args.healthGroup.args.enable = ACH:Toggle(L["Enable"], nil, 1, nil, nil, nil, nil, nil, nil, function() return unit == 'PLAYER' end)
group.args.healthGroup.args.height = ACH:Range(L["Height"], nil, 3, { min = minHeight, max = MaxHeight(unit), step = 1 })
group.args.healthGroup.args.width = ACH:Execute(L["Width"], nil, 4, function() ACD:SelectGroup('ElvUI', 'nameplates', 'generalGroup', 'clickableRange') end)
group.args.healthGroup.args.healPredictionGroup = ACH:Group(L["Heal Prediction"], nil, 5, nil, function(info) return E.db.nameplates.units[unit].health.healPrediction[info[#info]] end, function(info, value) E.db.nameplates.units[unit].health.healPrediction[info[#info]] = value NP:ConfigureAll() end)
group.args.healthGroup.args.healPredictionGroup.inline = true
group.args.healthGroup.args.healPredictionGroup.args.enable = ACH:Toggle(L["Enable"], nil, 1)
group.args.healthGroup.args.healPredictionGroup.args.absorbs = ACH:Toggle(L["Enable Absorbs"], nil, 2)
group.args.healthGroup.args.healPrediction = ACH:Toggle(L["Heal Prediction"], nil, 5)
group.args.healthGroup.args.textGroup = ACH:Group(L["Text"], nil, 200, nil, function(info) return E.db.nameplates.units[unit].health.text[info[#info]] end, function(info, value) E.db.nameplates.units[unit].health.text[info[#info]] = value NP:ConfigureAll() end)
group.args.healthGroup.args.textGroup.inline = true
ElvUI_OptionsUI/UnitFrames.lua
+1 -6
View File
@@ -2349,13 +2349,8 @@ local function GetOptionsTable_HealPrediction(updateFunc, groupName, numGroup)
type = "toggle",
name = L["Enable"]
},
absorbs = {
order = 3,
type = "toggle",
name = L["Enable Absorbs"]
},
colors = {
order = 4,
order = 3,
type = "execute",
name = L["COLORS"],
func = function() ACD:SelectGroup("ElvUI", "unitframe", "generalOptionsGroup", "allColorsGroup", "healPrediction") end,