From 0e07fc26e9c2c68ceea92b290c7507abcb330b1c Mon Sep 17 00:00:00 2001 From: Karl-HeinzSchneider <56960197+Karl-HeinzSchneider@users.noreply.github.com> Date: Sun, 28 Jul 2024 12:08:10 +0200 Subject: [PATCH] 165 actionbars rewrite activehidden logic (#166) * ActivateAllActionbars() * Add Actionbar.activate to Bar2/3/4/5 --- Modules/Actionbar.lua | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Modules/Actionbar.lua b/Modules/Actionbar.lua index f35b117..d35fb74 100644 --- a/Modules/Actionbar.lua +++ b/Modules/Actionbar.lua @@ -54,6 +54,7 @@ local defaults = { buttons = 12, padding = 2, alwaysShow = true, + activate = true, hideMacro = false, hideKeybind = false }, @@ -71,6 +72,7 @@ local defaults = { buttons = 12, padding = 2, alwaysShow = true, + activate = true, hideMacro = false, hideKeybind = false }, @@ -88,6 +90,7 @@ local defaults = { buttons = 12, padding = 2, alwaysShow = true, + activate = true, hideMacro = false, hideKeybind = false }, @@ -105,6 +108,7 @@ local defaults = { buttons = 12, padding = 2, alwaysShow = true, + activate = true, hideMacro = false, hideKeybind = false }, @@ -490,6 +494,16 @@ local function SetActionBarToggle(index, value) MultiActionBar_Update(); end +local function ActivateAllActionbars() + SHOW_MULTI_ACTIONBAR_1 = true + SHOW_MULTI_ACTIONBAR_2 = true + SHOW_MULTI_ACTIONBAR_3 = true + SHOW_MULTI_ACTIONBAR_4 = true + SetActionBarToggles(1, 1, 1, 1, 1) + SetActionBarToggles(true, true, true, true, true) + MultiActionBar_Update() +end + local function GetActionBarToggle(index) return select(index, GetActionBarToggles()); end @@ -674,7 +688,7 @@ local function GetBarOption(n) } for k, v in pairs(moreOptions) do opt.args[k] = v end - elseif n <= 5 then + elseif n <= 5 and false then local moreOptions = { activate = { type = 'toggle', @@ -1505,6 +1519,7 @@ function Module:OnEnable() -- not the best solution, override global CVAR and let DF UI handle everything C_CVar.SetCVar("alwaysShowActionBars", 1) + ActivateAllActionbars() Module.Temp = {} Module.UpdateRangeHooked = false @@ -2389,7 +2404,8 @@ function Module.ChangePossessBar() end function frame:OnEvent(event, arg1) - -- print('event', event) + -- print('event', event) + if event == 'PLAYER_ENTERING_WORLD' then ActivateAllActionbars() end end frame:SetScript('OnEvent', frame.OnEvent) @@ -3823,6 +3839,7 @@ function Module.Wrath() -- Module.ChangePossessBar() frame:RegisterEvent('PLAYER_REGEN_ENABLED') + frame:RegisterEvent("PLAYER_ENTERING_WORLD") Module.ChangeGryphon() -- Module.DrawActionbarDeco() @@ -3850,6 +3867,7 @@ function Module.Era() -- Module.ChangePossessBar() frame:RegisterEvent('PLAYER_REGEN_ENABLED') + frame:RegisterEvent("PLAYER_ENTERING_WORLD") Module.ChangeGryphon() -- Module.DrawActionbarDeco()