From c2a8f63344e8158a170d5c72fadf2c866203c71c Mon Sep 17 00:00:00 2001 From: shagu Date: Wed, 30 Apr 2025 00:51:37 +0200 Subject: [PATCH] dark-ui-elements: switch to flat config format --- mods/dark-ui-elements.lua | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/mods/dark-ui-elements.lua b/mods/dark-ui-elements.lua index 410793f..71fd522 100644 --- a/mods/dark-ui-elements.lua +++ b/mods/dark-ui-elements.lua @@ -10,11 +10,7 @@ local module = ShaguTweaks:register({ expansions = { ["vanilla"] = true, ["tbc"] = true }, enabled = nil, config = { - darkmode = { - color = { - r = .3, g = .3, b = .3, a = .9, - } - } + ["darkmode.color"] = { r = .3, g = .3, b = .3, a = .9 } } }) @@ -130,7 +126,7 @@ local function DarkenFrame(frame, r, g, b, a) -- set defaults if not r and not g and not b then - r, g, b, a = module.config.darkmode.color.r, module.config.darkmode.color.g, module.config.darkmode.color.b, module.config.darkmode.color.a + r, g, b, a = module.config["darkmode.color"].r, module.config["darkmode.color"].g, module.config["darkmode.color"].b, module.config["darkmode.color"].a end -- iterate through all subframes @@ -146,7 +142,7 @@ local function DarkenFrame(frame, r, g, b, a) local name = frame.GetName and frame:GetName() -- set a dark backdrop border color everywhere - frame:SetBackdropBorderColor(module.config.darkmode.color.r, module.config.darkmode.color.g, module.config.darkmode.color.b, module.config.darkmode.color.a) + frame:SetBackdropBorderColor(module.config["darkmode.color"].r, module.config["darkmode.color"].g, module.config["darkmode.color"].b, module.config["darkmode.color"].a) -- add special backgrounds to quests and such for pattern, inset in pairs(backgrounds) do @@ -155,7 +151,7 @@ local function DarkenFrame(frame, r, g, b, a) -- add black borders around specified buttons for pattern, inset in pairs(borders) do - if name and string.find(name, pattern) then AddBorder(frame, inset, module.config.darkmode.color) end + if name and string.find(name, pattern) then AddBorder(frame, inset, module.config["darkmode.color"]) end end -- scan through all regions (textures) @@ -198,17 +194,17 @@ module.enable = function(self) elseif not original and _G[name] then -- tbc buff buttons don't have borders, so we -- need to manually add a dark one. - AddBorder(_G[name], 2, module.config.darkmode.color) + AddBorder(_G[name], 2, module.config["darkmode.color"]) end end - TOOLTIP_DEFAULT_COLOR.r = module.config.darkmode.color.r - TOOLTIP_DEFAULT_COLOR.g = module.config.darkmode.color.g - TOOLTIP_DEFAULT_COLOR.b = module.config.darkmode.color.b + TOOLTIP_DEFAULT_COLOR.r = module.config["darkmode.color"].r + TOOLTIP_DEFAULT_COLOR.g = module.config["darkmode.color"].g + TOOLTIP_DEFAULT_COLOR.b = module.config["darkmode.color"].b - TOOLTIP_DEFAULT_BACKGROUND_COLOR.r = module.config.darkmode.color.r - TOOLTIP_DEFAULT_BACKGROUND_COLOR.g = module.config.darkmode.color.g - TOOLTIP_DEFAULT_BACKGROUND_COLOR.b = module.config.darkmode.color.b + TOOLTIP_DEFAULT_BACKGROUND_COLOR.r = module.config["darkmode.color"].r + TOOLTIP_DEFAULT_BACKGROUND_COLOR.g = module.config["darkmode.color"].g + TOOLTIP_DEFAULT_BACKGROUND_COLOR.b = module.config["darkmode.color"].b DarkenFrame(UIParent) DarkenFrame(WorldMapFrame) @@ -221,7 +217,7 @@ module.enable = function(self) if button[func] then local tex = button[func](button) if tex then - tex:SetVertexColor(module.config.darkmode.color.r+.2, module.config.darkmode.color.g+.2, module.config.darkmode.color.b+.2, 1) + tex:SetVertexColor(module.config["darkmode.color"].r+.2, module.config["darkmode.color"].g+.2, module.config["darkmode.color"].b+.2, 1) end end end @@ -230,12 +226,12 @@ module.enable = function(self) HookAddonOrVariable("Blizzard_AuctionUI", function() for i = 1, 15 do local tex = _G["AuctionFilterButton"..i]:GetNormalTexture() - tex:SetVertexColor(module.config.darkmode.color.r, module.config.darkmode.color.g, module.config.darkmode.color.b, 1) + tex:SetVertexColor(module.config["darkmode.color"].r, module.config["darkmode.color"].g, module.config["darkmode.color"].b, 1) end for i = 1, 8 do - _G["BrowseButton"..i.."Left"]:SetVertexColor(module.config.darkmode.color.r, module.config.darkmode.color.g, module.config.darkmode.color.b, 1) - _G["BrowseButton"..i.."Right"]:SetVertexColor(module.config.darkmode.color.r, module.config.darkmode.color.g, module.config.darkmode.color.b, 1) + _G["BrowseButton"..i.."Left"]:SetVertexColor(module.config["darkmode.color"].r, module.config["darkmode.color"].g, module.config["darkmode.color"].b, 1) + _G["BrowseButton"..i.."Right"]:SetVertexColor(module.config["darkmode.color"].r, module.config["darkmode.color"].g, module.config["darkmode.color"].b, 1) end end)