Skip to content

Commit 2ee6135

Browse files
committed
Resource Bar: group Texture / Orientation / Smooth into a Texture section
Mirror the Health Bar's layout — put the resource bar's Texture dropdown, Orientation, Reverse Fill Direction and Smooth Bar Animation together in one "Texture" section instead of scattering them across groups. Orientation and Reverse Fill stay as two explicit controls (clearer than a combined "Fill Direction" dropdown, where an option like "Bottom to Top" would also silently change the orientation). UI-only; no settings or render changes.
1 parent bfb0251 commit 2ee6135

1 file changed

Lines changed: 15 additions & 11 deletions

File tree

Options/Options.lua

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3667,7 +3667,6 @@ function DF:SetupGUIPages(GUI, CreateCategory, CreateSubTab, BuildPage)
36673667
settingsGroup:AddWidget(GUI:CreateCheckbox(self.child, L["DPS"], db, "resourceBarShowDPS", function() DF:UpdateAllFrames() end), 30)
36683668
local showInSolo = settingsGroup:AddWidget(GUI:CreateCheckbox(self.child, L["Show in Solo Mode"], db, "resourceBarShowInSoloMode", function() DF:UpdateAllFrames() end), 30)
36693669
showInSolo.hideOn = function() return GUI.SelectedMode == "raid" end
3670-
settingsGroup:AddWidget(GUI:CreateCheckbox(self.child, L["Smooth Bar Animation"], db, "resourceBarSmooth", function() DF:UpdateAllFrames() end), 30)
36713670
Add(settingsGroup, nil, 1)
36723671

36733672
-- ===== CLASS FILTER GROUP (Column 1) =====
@@ -3719,13 +3718,21 @@ function DF:SetupGUIPages(GUI, CreateCategory, CreateSubTab, BuildPage)
37193718
positionGroup:AddWidget(GUI:CreateSlider(self.child, L["Offset Y"], -50, 50, 1, db, "resourceBarY", nil, function() DF:LightweightUpdatePowerBarPosition() end, true), 55)
37203719
Add(positionGroup, nil, 2)
37213720

3722-
-- ===== ORIENTATION GROUP (Column 1) =====
3723-
local orientGroup = GUI:CreateSettingsGroup(self.child, 280)
3724-
orientGroup:AddWidget(GUI:CreateHeader(self.child, L["Orientation"]), 40)
3725-
local orientOptions = { HORIZONTAL= L["Horizontal"], VERTICAL= L["Vertical"] }
3726-
orientGroup:AddWidget(GUI:CreateDropdown(self.child, L["Orientation"], orientOptions, db, "resourceBarOrientation", function() DF:UpdateAllFrames() end), 55)
3727-
orientGroup:AddWidget(GUI:CreateCheckbox(self.child, L["Reverse Fill Direction"], db, "resourceBarReverseFill", function() DF:UpdateAllFrames() end), 30)
3728-
Add(orientGroup, nil, 1)
3721+
-- ===== TEXTURE GROUP (Column 1) — mirrors the Health Bar's Texture group:
3722+
-- Texture, Orientation / Reverse Fill, and Smooth Bar Animation in one place. =====
3723+
local textureGroup = GUI:CreateSettingsGroup(self.child, 280)
3724+
textureGroup:AddWidget(GUI:CreateHeader(self.child, L["Texture"]), 40)
3725+
textureGroup:AddWidget(GUI:CreateTextureDropdown(self.child, L["Texture"], db, "resourceBarTexture", function() DF:UpdateAllFrames() end), 55)
3726+
3727+
-- Keep Orientation (Horizontal/Vertical) and Reverse Fill as two explicit
3728+
-- controls — clearer than a combined "Fill Direction" dropdown, where an
3729+
-- option like "Bottom to Top" silently changes the orientation too.
3730+
local orientOptions = { HORIZONTAL = L["Horizontal"], VERTICAL = L["Vertical"] }
3731+
textureGroup:AddWidget(GUI:CreateDropdown(self.child, L["Orientation"], orientOptions, db, "resourceBarOrientation", function() DF:UpdateAllFrames() end), 55)
3732+
textureGroup:AddWidget(GUI:CreateCheckbox(self.child, L["Reverse Fill Direction"], db, "resourceBarReverseFill", function() DF:UpdateAllFrames() end), 30)
3733+
3734+
textureGroup:AddWidget(GUI:CreateCheckbox(self.child, L["Smooth Bar Animation"], db, "resourceBarSmooth", function() DF:UpdateAllFrames() end), 30)
3735+
Add(textureGroup, nil, 1)
37293736

37303737
-- ===== BACKGROUND GROUP (Column 2) =====
37313738
local bgGroup = GUI:CreateSettingsGroup(self.child, 280)
@@ -3782,9 +3789,6 @@ function DF:SetupGUIPages(GUI, CreateCategory, CreateSubTab, BuildPage)
37823789
local colorGroup = GUI:CreateSettingsGroup(self.child, 280)
37833790
colorGroup:AddWidget(GUI:CreateHeader(self.child, L["Resource Colors"]), 40)
37843791
colorGroup:AddWidget(GUI:CreateLabel(self.child, L["Customize resource bar colors per power type. Shared across party and raid frames."], 260), 40)
3785-
-- Fill texture (configurable; defaults to the DF house texture).
3786-
colorGroup:AddWidget(GUI:CreateTextureDropdown(self.child, L["Texture"], db, "resourceBarTexture", function() DF:UpdateAllFrames() end), 55)
3787-
37883792
-- Colour mode: Power Type (per-power colours below) / Class / Custom.
37893793
local RESOURCE_COLOR_MODES = {
37903794
POWER_TYPE = L["Power Type"], CLASS = L["Class"], CUSTOM = L["Custom"],

0 commit comments

Comments
 (0)