Minor visual improvements to the config UI

Author: Numynum

ImportExportUtilV2.lua

@@ -4,7 +4,7 @@ if C_Traits.GetLoadoutSerializationVersion() ~= LOADOUT_SERIALIZATION_VERSION th
 --- @class TTT_NS
 local ns = select(2, ...);
 
---- @class TalentTreeTweaks_ImportExportUtilV2
+--- @class TTT_ImportExportUtilV2
 local ImportExportUtil = {};
 ns.ImportExportUtil = ImportExportUtil;
 

SharedUtil.lua

@@ -1,7 +1,7 @@
 --- @class TTT_NS
 local ns = select(2, ...);
 
---- @class TalentTreeTweaks_Util
+--- @class TTT_Util
 local Util = {};
 ns.Util = Util;
 local L = ns.L;

config.lua

@@ -226,18 +226,20 @@ do
 
     --- @param text string
     --- @param tooltip string?
+    --- @param indent number? # default 0
     --- @return SettingsListElementInitializer initializer
-    function ConfigBuilderMixin:MakeHeader(text, tooltip)
-        local initializer = Config:MakeHeader(text, tooltip);
+    function ConfigBuilderMixin:MakeHeader(text, tooltip, indent)
+        local initializer = Config:MakeHeader(text, tooltip, indent);
         initializer:AddShownPredicate(self.isExpanded);
 
         return initializer;
     end
 
     --- @param text string
+    --- @param indent number? # default 0
     --- @return SettingsListElementInitializer initializer
-    function ConfigBuilderMixin:MakeText(text)
-        local initializer = Config:MakeText(text);
+    function ConfigBuilderMixin:MakeText(text, indent)
+        local initializer = Config:MakeText(text, indent);
         initializer:AddShownPredicate(self.isExpanded);
 
         return initializer;
@@ -365,26 +367,55 @@ end
 do
     --- @param text string
     --- @param tooltip string?
+    --- @param indent number? # default 0
     --- @return SettingsListElementInitializer
-    function Config:MakeHeader(text, tooltip)
-        local headerInitializer = CreateSettingsListSectionHeaderInitializer(text, tooltip);
+    function Config:MakeHeader(text, tooltip, indent)
+        local data = { name = text, tooltip = tooltip, indent = indent or 0 };
+        --- @type SettingsListElementInitializer
+        local headerInitializer = Settings.CreateElementInitializer("TalentTreeTweaks_SettingsHeaderTemplate", data);
+
         self.layout:AddInitializer(headerInitializer);
 
         return headerInitializer;
     end
 
-    local heightCalculator = UIParent:CreateFontString(nil, "ARTWORK", "GameFontNormal");
-    heightCalculator:SetWidth(635);
+    local calculateHeight;
+    do
+        local heightCalculator = UIParent:CreateFontString(nil, "ARTWORK", "GameFontNormal");
+        local deferrer = CreateFrame("Frame");
+        deferrer:Hide();
+        deferrer.callbacks = {};
+        deferrer:SetScript("OnUpdate", function()
+            for _, callback in pairs(deferrer.callbacks) do
+                securecallfunction(callback);
+            end
+            deferrer.callbacks = {};
+        end);
+        function deferrer:Defer(callback)
+            table.insert(self.callbacks, callback);
+            self:Show();
+        end
+        calculateHeight = function(data, deferred)
+            local text, indent = data.name, data.indent;
+            heightCalculator:SetWidth(635 - (indent * 15));
+            heightCalculator:SetText(text);
+
+            data.extent = heightCalculator:GetStringHeight();
+            if not deferred then
+                deferrer:Defer(function() calculateHeight(data, true); end);
+            end
+        end
+    end
 
     --- @param text string
+    --- @param indent number? # default 0
     --- @return SettingsListElementInitializer
-    function Config:MakeText(text)
-        heightCalculator:SetText(text);
-
+    function Config:MakeText(text, indent)
         local data = {
             name = text,
-            extent = heightCalculator:GetStringHeight(),
+            indent = indent or 0,
         };
+        calculateHeight(data);
         --- @type SettingsListElementInitializer
         local textInitializer = Settings.CreateElementInitializer("TalentTreeTweaks_SettingsTextTemplate", data);
 
@@ -564,6 +595,8 @@ do
 
                 return initializer:GetExtent();
             end
+
+            frame:EvaluateVisibility(self.data.expanded);
         end
 
         self.layout:AddInitializer(expandInitializer);
@@ -606,7 +639,7 @@ do
     function Config:MakeDonationPrompt(layout)
         self:MakeText(L["Addon development takes a large amount of time and effort. If you enjoy using Talent Tree Tweaks, please consider supporting its development by donating. Your support helps ensure the continued improvement and maintenance of the addon. Thank you for your generosity!"]);
 
-        local function onClick(buttonIndex)
+        local function onClick(_, buttonIndex)
             if buttonIndex == 1 then
                 ns.Util:CopyText("https://www.paypal.com/cgi-bin/webscr?hosted_button_id=C8HP9WVKPCL8C&item_name=Talent+Tree+Tweaks&cmd=_s-xclick");
             else
@@ -784,6 +817,25 @@ do
             self.Text:SetText(data.name);
             self.Text:SetHeight(data.extent);
             self:SetHeight(data.extent);
+            local indent = data.indent or 0;
+            self.Text:SetPoint('TOPLEFT', (7 + (indent * 15)), 0);
+        end
+    end
+
+    TalentTreeTweaks_SettingsHeaderMixin = CreateFromMixins(DefaultTooltipMixin);
+    do
+        --- @class TTT_Config_HeaderMixin
+        local mixin = TalentTreeTweaks_SettingsHeaderMixin;
+
+        function mixin:Init(initializer)
+            local data = initializer:GetData();
+            self.Title:SetTextToFit(data.name);
+            local indent = data.indent or 0;
+            self.Title:SetPoint('TOPLEFT', (7 + (indent * 15)), -16);
+
+            self:SetCustomTooltipAnchoring(self.Title, "ANCHOR_RIGHT");
+
+            self:SetTooltipFunc(function() Settings.InitTooltip(initializer:GetName(), initializer:GetTooltip()) end);
         end
     end
 end

core.lua

@@ -7,7 +7,7 @@ _G.TalentTreeTweaks = ns;
 if not _G.TTT then _G.TTT = ns; end
 --@end-debug@
 
---- @class TalentTreeTweaks_Main: AceAddon, AceConsole-3.0, AceHook-3.0, AceEvent-3.0
+--- @class TTT_Main: AceAddon, AceConsole-3.0, AceHook-3.0, AceEvent-3.0
 local Main = LibStub('AceAddon-3.0'):NewAddon(name, 'AceConsole-3.0', 'AceHook-3.0', 'AceEvent-3.0');
 if not Main then return; end
 ns.Main = Main;

modules/autoPurchaseGenericTalents.lua

@@ -180,131 +180,136 @@ function Module:BuildConfig(configBuilder, db)
     do
         local function isLoaded() return not not self.skyridingConfigID; end;
         local function isNotLoaded() return not isLoaded; end;
-        configBuilder:MakeHeader(GENERIC_TRAIT_FRAME_DRAGONRIDING_TITLE);
-        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked the Skyriding system on this character yet.']);
+        local header = configBuilder:MakeHeader(GENERIC_TRAIT_FRAME_DRAGONRIDING_TITLE, nil, 2);
+        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked the Skyriding system on this character yet.'], 2);
         loading:AddShownPredicate(isNotLoaded);
         configBuilder:MakeCheckbox(
             ENABLE,
             'skyridingEnabled',
             L['Automatically purchase %s talents when you have enough currency.']:format(GENERIC_TRAIT_FRAME_DRAGONRIDING_TITLE)
-        );
+        ):SetParentInitializer(header);
         configBuilder:MakeButton(
             L['Toggle UI'],
             function() self:ToggleTreeUI(SKYRIDING_TREE_ID); end,
             L['Toggle the %s UI to view and adjust talents.']:format(GENERIC_TRAIT_FRAME_DRAGONRIDING_TITLE)
-        ):AddModifyPredicate(isLoaded);
+        ):SetParentInitializer(header, isLoaded);
         configBuilder:MakeDropdown(
             L['Auto Ride Along'],
             'rideAlong',
             L['Automatically enable/disable Ride Along the first time you log in on a character.'],
             {
-                { value = CHOICE_NODE_OPTION_1, text = L['Enable Ride Along'], },
-                { value = CHOICE_NODE_OPTION_2, text = L['Disable Ride Along'], },
-                { value = CHOICE_NODE_NOT_SET,  text = L['Do Nothing'], },
+                { value = CHOICE_NODE_OPTION_1, text = L['Enable Ride Along'] },
+                { value = CHOICE_NODE_OPTION_2, text = L['Disable Ride Along'] },
+                { value = CHOICE_NODE_NOT_SET, text = L['Do Nothing'] },
             },
             setEnabledTreeIDs
-        );
+        ):SetParentInitializer(header);
         configBuilder:MakeButton(
             L['Reset Ride Along Cache'],
             function()
                 self.db.rideAlongCache = {};
                 self:DefferPurchase();
             end,
             L['Reset the Ride Along cache, so all characters will match the current setting on login.']
-        );
+        ):SetParentInitializer(header);
         configBuilder:MakeDropdown(
             L['Auto Surge Choice'],
             'surge',
             L['Automatically pick Whirling Surge/Lightning Surge the first time you log in on a character.'],
             {
-                { value = CHOICE_NODE_OPTION_1, text = StripHyperlinks(C_Spell.GetSpellLink(WHIRLING_SURGE_SPELL_ID)) or 'Whirling Surge', },
-                { value = CHOICE_NODE_OPTION_2, text = StripHyperlinks(C_Spell.GetSpellLink(LIGHTNING_SURGE_SPELL_ID)) or 'Lightning Surge', },
-                { value = CHOICE_NODE_NOT_SET,  text = L['Do Nothing'], },
+                { value = CHOICE_NODE_OPTION_1, text = StripHyperlinks(C_Spell.GetSpellLink(WHIRLING_SURGE_SPELL_ID)) or 'Whirling Surge' },
+                { value = CHOICE_NODE_OPTION_2, text = StripHyperlinks(C_Spell.GetSpellLink(LIGHTNING_SURGE_SPELL_ID)) or 'Lightning Surge' },
+                { value = CHOICE_NODE_NOT_SET, text = L['Do Nothing'] },
             },
             setEnabledTreeIDs
-        );
+        ):SetParentInitializer(header);
         configBuilder:MakeButton(
             L['Reset Surge Cache'],
             function()
                 self.db.surgeCache = {};
                 self:DefferPurchase();
             end,
             L['Reset the Surge cache, so all characters will match the current setting on login.']
-        );
+        ):SetParentInitializer(header);
     end
     do
         local function isLoaded() return not not self:GetLemixConfigID(); end;
         local function isNotLoaded() return not isLoaded(); end;
         local function isLemix() return IS_LEMIX; end;
-        configBuilder:MakeHeader(L['Legion Remix: Limits Unbound']):AddShownPredicate(isLemix);
-        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked Legion Remix artifact traits yet.']);
+        local header = configBuilder:MakeHeader(L['Legion Remix: Limits Unbound'], nil, 2)
+        header:AddShownPredicate(isLemix);
+
+        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked Legion Remix artifact traits yet.'], 2);
         loading:AddShownPredicate(isNotLoaded);
         loading:AddShownPredicate(isLemix);
 
-        configBuilder:MakeCheckbox(
+        local enabled = configBuilder:MakeCheckbox(
             ENABLE,
             'lemixLimitsUnboundEnabled',
             L['Automatically upgrade the final Limits Unbound talent when you have enough currency.']
-        ):AddShownPredicate(isLemix);
+        );
+        enabled:AddShownPredicate(isLemix);
+        enabled:SetParentInitializer(header);
+
         local openUI = configBuilder:MakeButton(
             L['Open Artifact Traits UI'],
             function() SocketInventoryItem(16); end,
             L['Open the Legion Remix Artifact traits UI to view and adjust talents.']
         );
-        openUI:AddModifyPredicate(isLoaded)
+        openUI:SetParentInitializer(header, isLoaded)
         openUI:AddShownPredicate(isLemix);
     end
     do
         local function isLoaded() return not not self.reshiiWrapsConfigID; end;
         local function isNotLoaded() return not isLoaded(); end;
-        configBuilder:MakeHeader(GENERIC_TRAIT_FRAME_RESHII_WRAPS_TITLE);
-        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked the %s system on this character yet.']:format(GENERIC_TRAIT_FRAME_RESHII_WRAPS_TITLE));
+        local header = configBuilder:MakeHeader(GENERIC_TRAIT_FRAME_RESHII_WRAPS_TITLE, nil, 2);
+        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked the %s system on this character yet.']:format(GENERIC_TRAIT_FRAME_RESHII_WRAPS_TITLE), 2);
         loading:AddShownPredicate(isNotLoaded);
         configBuilder:MakeCheckbox(
             ENABLE,
             'reshiiWrapsEnabled',
             L['Automatically purchase %s talents when you have enough currency.']:format(GENERIC_TRAIT_FRAME_RESHII_WRAPS_TITLE)
-        );
+        ):SetParentInitializer(header);
         configBuilder:MakeButton(
             L['Toggle UI'],
             function() self:ToggleTreeUI(RESHII_WRAPS_TREE_ID); end,
             L['Toggle the %s UI to view and adjust talents.']:format(GENERIC_TRAIT_FRAME_RESHII_WRAPS_TITLE)
-        ):AddModifyPredicate(isLoaded);
+        ):SetParentInitializer(header, isLoaded);
     end
     do
         local HORRIFIC_VISIONS_TITLE = SPLASH_BATTLEFORAZEROTH_8_3_0_FEATURE1_TITLE or L['Horrific Visions'];
         local function isLoaded() return not not self.horrificVisionsConfigID; end;
         local function isNotLoaded() return not isLoaded(); end;
-        configBuilder:MakeHeader(HORRIFIC_VISIONS_TITLE);
-        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked the Horrific Visions system on this character yet.']);
+        local header = configBuilder:MakeHeader(HORRIFIC_VISIONS_TITLE, nil, 2);
+        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked the Horrific Visions system on this character yet.'], 2);
         loading:AddShownPredicate(isNotLoaded);
         configBuilder:MakeCheckbox(
             ENABLE,
             'horrificVisionsEnabled',
             L['Automatically purchase Horrific Visions talents when you have enough currency.']
-        );
+        ):SetParentInitializer(header);
         configBuilder:MakeButton(
             L['Toggle UI'],
             function() self:ToggleTreeUI(HORRIFIC_VISIONS_TREE_ID); end,
             L['Toggle the %s UI to view and adjust talents.']:format(HORRIFIC_VISIONS_TITLE)
-        ):AddModifyPredicate(isLoaded);
+        ):SetParentInitializer(header, isLoaded);
     end
     do
         local function isLoaded() return not not self.overchargedTitanConsoleConfigID; end;
         local function isNotLoaded() return not isLoaded(); end;
-        configBuilder:MakeHeader(GENERIC_TRAIT_FRAME_TITAN_CONSOLE_TITLE);
-        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked the %s system on this character yet.']:format(GENERIC_TRAIT_FRAME_TITAN_CONSOLE_TITLE));
+        local header = configBuilder:MakeHeader(GENERIC_TRAIT_FRAME_TITAN_CONSOLE_TITLE, nil, 2);
+        local loading = configBuilder:MakeText(L['Loading...'] .. '\n' .. L['You have not unlocked the %s system on this character yet.']:format(GENERIC_TRAIT_FRAME_TITAN_CONSOLE_TITLE), 2);
         loading:AddShownPredicate(isNotLoaded);
         configBuilder:MakeCheckbox(
             ENABLE,
             'overchargedTitanConsoleEnabled',
             L['Automatically purchase %s talents when you have enough currency.']:format(GENERIC_TRAIT_FRAME_TITAN_CONSOLE_TITLE)
-        );
+        ):SetParentInitializer(header);
         configBuilder:MakeButton(
             L['Toggle UI'],
             function() self:ToggleTreeUI(OVERCHARGED_TITAN_CONSOLE_TREE_ID); end,
             L['Toggle the %s UI to view and adjust talents.']:format(GENERIC_TRAIT_FRAME_TITAN_CONSOLE_TITLE)
-        ):AddModifyPredicate(isLoaded);
+        ):SetParentInitializer(header, isLoaded);
     end
 end
 

modules/copyTalentButtonInfo.lua

@@ -5,7 +5,7 @@ local Main = TTT.Main;
 local Util = TTT.Util;
 local L = TTT.L;
 
---- @class TalentTreeTweaks_CopyTalentButtonInfo: TTT_Module, AceHook-3.0, AceEvent-3.0
+--- @class TTT_CopyTalentButtonInfo: TTT_Module, AceHook-3.0, AceEvent-3.0
 local Module = Main:NewModule('CopyTalentButtonInfo', 'AceHook-3.0', 'AceEvent-3.0');
 
 function Module:OnInitialize()

modules/debugNodeInfo.lua

@@ -79,7 +79,7 @@ function Module:BuildConfig(configBuilder, db)
     };
     configBuilder:SetDefaults(defaults, true);
 
-    configBuilder:MakeText(L['You can toggle any of the following on/off to enable/disable the integration with that debug tool.']);
+    configBuilder:MakeText(L['You can toggle any of the following on/off to enable/disable the integration with that debug tool.'], 2);
 
     configBuilder:MakeCheckbox(
         '/tinspect',

modules/exportInspectedBuild.lua

@@ -1,9 +1,7 @@
 --- @class TTT_NS
 local TTT = select(2, ...);
 
---- @type TalentTreeTweaks_Main
 local Main = TTT.Main;
---- @type TalentTreeTweaks_Util
 local Util = TTT.Util;
 local L = TTT.L;
 
@@ -12,7 +10,7 @@ local ChatFrame_OpenChat = ChatFrameUtil and ChatFrameUtil.OpenChat or ChatFrame
 
 local LEVEL_CAP = 80;
 
---- @class TTT_ExportInspectedBuild: AceModule, AceHook-3.0, AceEvent-3.0
+--- @class TTT_ExportInspectedBuild: TTT_Module, AceHook-3.0, AceEvent-3.0
 local Module = Main:NewModule('ExportInspectedBuild', 'AceHook-3.0', 'AceEvent-3.0');
 
 --- @param unit UnitToken

modules/heroTalents.lua

@@ -5,7 +5,7 @@ local Main = TTT.Main;
 local Util = TTT.Util;
 local L = TTT.L;
 
---- @class TTT_HeroTalents: AceModule, AceHook-3.0
+--- @class TTT_HeroTalents: TTT_Module, AceHook-3.0
 local Module = Main:NewModule('HeroTalents', 'AceHook-3.0');
 
 local function RunScript(frame, script, ...)