From 08533849c52b420026ccb314aef064dd77ce32b4 Mon Sep 17 00:00:00 2001 From: Artur Morozov Date: Wed, 12 Jun 2019 23:07:28 +0300 Subject: [PATCH] tbc: fix micro menu --- compat/tbc.lua | 7 +++++++ compat/vanilla.lua | 9 +++++++-- modules/panel.lua | 6 ------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/compat/tbc.lua b/compat/tbc.lua index 7feff703..b7c19889 100644 --- a/compat/tbc.lua +++ b/compat/tbc.lua @@ -5,6 +5,13 @@ if pfUI.expansion ~= "tbc" then return end -- [[ Constants ]]-- CASTBAR_EVENT_CAST_DELAY = "UNIT_SPELLCAST_DELAYED" CASTBAR_EVENT_CHANNEL_DELAY = "UNIT_SPELLCAST_CHANNEL_UPDATE" + +MICRO_BUTTONS = { + 'CharacterMicroButton', 'SpellbookMicroButton', 'TalentMicroButton', + 'QuestLogMicroButton', 'SocialsMicroButton', 'LFGMicroButton', + 'MainMenuMicroButton', 'HelpMicroButton', +} + NAMEPLATE_OBJECTORDER = { "border", "_", "_", "glow", "name", "level", "levelicon", "raidicon" } NAMEPLATE_FRAMETYPE = "Frame" diff --git a/compat/vanilla.lua b/compat/vanilla.lua index e6a22360..cc4a20dc 100644 --- a/compat/vanilla.lua +++ b/compat/vanilla.lua @@ -6,8 +6,13 @@ if pfUI.expansion ~= "vanilla" then return end CASTBAR_EVENT_CAST_DELAY = "SPELLCAST_DELAYED" CASTBAR_EVENT_CHANNEL_DELAY = "SPELLCAST_CHANNEL_UPDATE" -NAMEPLATE_OBJECTORDER = { "border", "glow", "name", "level", "levelicon", - "raidicon" } +MICRO_BUTTONS = { + 'CharacterMicroButton', 'SpellbookMicroButton', 'TalentMicroButton', + 'QuestLogMicroButton', 'SocialsMicroButton', 'WorldMapMicroButton', + 'MainMenuMicroButton', 'HelpMicroButton', +} + +NAMEPLATE_OBJECTORDER = { "border", "glow", "name", "level", "levelicon", "raidicon" } NAMEPLATE_FRAMETYPE = "Button" diff --git a/modules/panel.lua b/modules/panel.lua index 05ba84a5..75becf8c 100644 --- a/modules/panel.lua +++ b/modules/panel.lua @@ -716,12 +716,6 @@ pfUI:RegisterModule("panel", "vanilla:tbc", function() pfUI.panel.microbutton:SetWidth(145) pfUI.panel.microbutton:SetFrameStrata("MEDIUM") - local MICRO_BUTTONS = { - 'CharacterMicroButton', 'SpellbookMicroButton', 'TalentMicroButton', - 'QuestLogMicroButton', 'SocialsMicroButton', 'WorldMapMicroButton', - 'MainMenuMicroButton', 'HelpMicroButton', - } - for i=1,table.getn(MICRO_BUTTONS) do local anchor = _G[MICRO_BUTTONS[i-1]] or pfUI.panel.microbutton local button = _G[MICRO_BUTTONS[i]]