[Feature] Implement "Remaining & Max" timer format for Cast Bar

Krealle · Nov 8, 2024 · b05964e · b05964e
1 parent 05d3f2b
commit b05964e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/Data/Constants.lua b/Data/Constants.lua
@@ -248,6 +248,7 @@ const.COLORS = {
 const.CastBarTimerFormat = {
     NORMAL = "normal",
     REMAINING = "remaining",
+    REMAINING_AND_MAX = "remaining-and-max",
     DURATION = "duration",
     DURATION_AND_MAX = "duration-and-max",
     HIDDEN = "hidden",

diff --git a/Locales/enUS.lua b/Locales/enUS.lua
@@ -110,6 +110,7 @@ L["normal"] = "Normal"
 L["remaining"] = "Remaining"
 L["duration"] = "Duration"
 L["duration-and-max"] = "Duration & Max"
+L["remaining-and-max"] = "Remaining & Max"
 L.hidden = "Hidden"
 L.ShowSpell = "Show Spell"
 L.Empower = "Empower"

diff --git a/Menu/Builder.lua b/Menu/Builder.lua
@@ -1424,10 +1424,11 @@ function Builder:CreateCastBarTimerFontOptions(parent, widgetName)
         const.CastBarTimerFormat.HIDDEN,
         const.CastBarTimerFormat.NORMAL,
         const.CastBarTimerFormat.REMAINING,
+        const.CastBarTimerFormat.REMAINING_AND_MAX,
         const.CastBarTimerFormat.DURATION,
         const.CastBarTimerFormat.DURATION_AND_MAX,
     }
-    f.timerFormat = self:CreateDropdown(f, widgetName, L.TimerFormat, nil,
+    f.timerFormat = self:CreateDropdown(f, widgetName, L.TimerFormat, 140,
         items, const.OPTION_KIND.TIMER_FORMAT)
     self:AnchorBelow(f.timerFormat, f.fontOptions.styleDropdown)
 

diff --git a/Widgets/Bars/CastBar.lua b/Widgets/Bars/CastBar.lua
@@ -401,15 +401,29 @@ local function onUpdate(self, elapsed)
             if self.empowering then
                 self.timerText:SetFormattedText("%d", self.CurStage)
             elseif timerFormat == const.CastBarTimerFormat.DURATION then
-                self.timerText:SetFormattedText("%.1f", self.duration)
-            elseif timerFormat == const.CastBarTimerFormat.REMAINING then
-                self.timerText:SetFormattedText("%.1f", (self.max - self.duration))
+                local dur = self.duration
+                if self.channeling then
+                    dur = (self.max - self.duration)
+                end
+                self.timerText:SetFormattedText("%.1f", dur)
             elseif timerFormat == const.CastBarTimerFormat.DURATION_AND_MAX then
                 local dur = self.duration
                 if self.channeling then
                     dur = (self.max - self.duration)
                 end
                 self.timerText:SetFormattedText("%.1f / %.1f", dur, self.max)
+            elseif timerFormat == const.CastBarTimerFormat.REMAINING then
+                local dur = self.duration
+                if not self.channeling then
+                    dur = (self.max - self.duration)
+                end
+                self.timerText:SetFormattedText("%.1f", dur)
+            elseif timerFormat == const.CastBarTimerFormat.REMAINING_AND_MAX then
+                local dur = self.duration
+                if not self.channeling then
+                    dur = (self.max - self.duration)
+                end
+                self.timerText:SetFormattedText("%.1f / %.1f", dur, self.max)
             elseif self.channeling then
                 self.timerText:SetFormattedText("%.1f", self.duration)
             else