Skip to content

Handle missing cooldown data for aura countdown text #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanderBot merged 2 commits into from
Dec 1, 2025
Merged

Handle missing cooldown data for aura countdown text #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33c3dc6
Fix countdown text initialization
DanderBot Dec 1, 2025
ce41942
Merge branch 'main' into codex/add-countdown-formatting-options-for-b…
DanderBot Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 57 additions & 41 deletions DandersFrames_Auras.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function DF:ApplyAuraLayout(frame)

-- Parse "PRIMARY_SECONDARY" growth strings (e.g., "LEFT_DOWN")
-- Added stackFont argument and countdown arguments
local function ApplyLayout(auraFrames, scale, alpha, anchor, growthString, limit, offX, offY, maxCount, clickThrough, stackScale, stackAnchor, stackX, stackY, stackOutline, stackFont, showCountdown, countdownScale, countdownFont, countdownOutline, countdownX, countdownY, countdownDecimalMode, hideSwipe)
local function ApplyLayout(auraFrames, scale, alpha, anchor, growthString, limit, offX, offY, maxCount, clickThrough, stackScale, stackAnchor, stackX, stackY, stackOutline, stackFont, showCountdown, countdownScale, countdownFont, countdownOutline, countdownX, countdownY, countdownDecimalMode, hideSwipe)
if not auraFrames then return end

-- Split growth direction string
Expand Down Expand Up @@ -136,34 +136,50 @@ function DF:ApplyAuraLayout(frame)
self.elapsed = (self.elapsed or 0) + elapsed
if self.elapsed < 0.1 then return end
self.elapsed = 0

local cd = self.cooldown
local text = self:GetParent().dfCountdownText

-- Use our stored values instead of API calls
if cd and cd:IsShown() and cd.dfStart and cd.dfDuration and cd.dfDuration > 0 then
local remaining = (cd.dfStart + cd.dfDuration) - GetTime()

if remaining > 0.5 then
if remaining >= 3600 then
text:SetText(math.floor(remaining / 3600) .. "h")
elseif remaining >= 60 then
text:SetText(math.floor(remaining / 60) .. "m")
elseif remaining >= 10 then
text:SetText(math.floor(remaining))
elseif remaining >= 3 then
text:SetFormattedText("%.0f", remaining)
else
if countdownDecimalMode == "WHOLE" then
text:SetFormattedText("%.0f", remaining)
else
text:SetFormattedText("%.1f", remaining)
end
end
text:Show()
else
text:Hide()
end
if cd and cd:IsShown() then
-- Capture any cooldown values we might have missed before the SetCooldown hook ran
if (not cd.dfStart or not cd.dfDuration) and cd.GetCooldownTimes then
local start, duration = cd:GetCooldownTimes()
if start and duration then
-- GetCooldownTimes returns milliseconds
start = start / 1000
duration = duration / 1000

if duration > 0 then
cd.dfStart = start
cd.dfDuration = duration
end
end
end

if cd.dfStart and cd.dfDuration and cd.dfDuration > 0 then
local remaining = (cd.dfStart + cd.dfDuration) - GetTime()

if remaining > 0.5 then
if remaining >= 3600 then
text:SetText(math.floor(remaining / 3600) .. "h")
elseif remaining >= 60 then
text:SetText(math.floor(remaining / 60) .. "m")
elseif remaining >= 10 then
text:SetText(math.floor(remaining))
elseif remaining >= 3 then
text:SetFormattedText("%.0f", remaining)
else
if countdownDecimalMode == "WHOLE" then
text:SetFormattedText("%.0f", remaining)
else
text:SetFormattedText("%.1f", remaining)
end
end
text:Show()
else
text:Hide()
end
else
text:Hide()
end
Expand Down Expand Up @@ -261,13 +277,13 @@ function DF:ApplyAuraLayout(frame)
db.raidBuffStackFont,
db.raidBuffShowCountdown,
db.raidBuffCountdownScale,
db.raidBuffCountdownFont,
db.raidBuffCountdownOutline,
db.raidBuffCountdownX,
db.raidBuffCountdownY,
db.raidBuffCountdownDecimalMode,
db.raidBuffHideSwipe
)
db.raidBuffCountdownFont,
db.raidBuffCountdownOutline,
db.raidBuffCountdownX,
db.raidBuffCountdownY,
db.raidBuffCountdownDecimalMode,
db.raidBuffHideSwipe
)

-- Apply to Debuffs
ApplyLayout(
Expand All @@ -289,14 +305,14 @@ function DF:ApplyAuraLayout(frame)
db.raidDebuffStackFont,
db.raidDebuffShowCountdown,
db.raidDebuffCountdownScale,
db.raidDebuffCountdownFont,
db.raidDebuffCountdownOutline,
db.raidDebuffCountdownX,
db.raidDebuffCountdownY,
db.raidDebuffCountdownDecimalMode,
db.raidDebuffHideSwipe
)
end
db.raidDebuffCountdownFont,
db.raidDebuffCountdownOutline,
db.raidDebuffCountdownX,
db.raidDebuffCountdownY,
db.raidDebuffCountdownDecimalMode,
db.raidDebuffHideSwipe
)
end

-- =========================================================================
-- DEMO DISPEL ICON (Custom Preview Icon)
Expand Down