From 27312ac2494b789397c596c6905ae47fd9638038 Mon Sep 17 00:00:00 2001 From: Crum Date: Fri, 28 Dec 2018 19:53:47 -0600 Subject: [PATCH] update --- ElvUI/Modules/ActionBars/Microbar.lua | 40 +++++++++++++++++++++------ 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/ElvUI/Modules/ActionBars/Microbar.lua b/ElvUI/Modules/ActionBars/Microbar.lua index e2e67ef..aade5fc 100644 --- a/ElvUI/Modules/ActionBars/Microbar.lua +++ b/ElvUI/Modules/ActionBars/Microbar.lua @@ -23,18 +23,38 @@ local MICRO_BUTTONS = { "HelpMicroButton" } -local function onEnter() +local function onEnterBar() if AB.db.microbar.mouseover then UIFrameFadeIn(ElvUI_MicroBar, 0.2, ElvUI_MicroBar:GetAlpha(), AB.db.microbar.alpha) end end -local function onLeave() +local function onLeaveBar() if AB.db.microbar.mouseover then UIFrameFadeOut(ElvUI_MicroBar, 0.2, ElvUI_MicroBar:GetAlpha(), 0) end end +local function onEnterButton(button) + if AB.db.microbar.mouseover then + UIFrameFadeIn(ElvUI_MicroBar, 0.2, ElvUI_MicroBar:GetAlpha(), AB.db.microbar.alpha) + end + + if button.backdrop then + button.backdrop:SetBackdropBorderColor(unpack(E.media.rgbvaluecolor)) + end +end + +local function onLeaveButton(button) + if AB.db.microbar.mouseover then + UIFrameFadeOut(ElvUI_MicroBar, 0.2, ElvUI_MicroBar:GetAlpha(), 0) + end + + if button.backdrop then + button.backdrop:SetBackdropBorderColor(unpack(E.media.bordercolor)) + end +end + function AB:HandleMicroButton(button) local pushed = button:GetPushedTexture() local normal = button:GetNormalTexture() @@ -48,8 +68,8 @@ function AB:HandleMicroButton(button) button:SetParent(ElvUI_MicroBar) E:Kill(button:GetHighlightTexture()) - HookScript(button, "OnEnter", onEnter) - HookScript(button, "OnLeave", onLeave) + HookScript(button, "OnEnter", onEnterButton) + HookScript(button, "OnLeave", onLeaveButton) button:SetHitRectInsets(0, 0, 0, 0) button:SetAlpha(self.db.microbar.alpha) button:Show() @@ -104,12 +124,16 @@ function AB:UpdateMicroPositionDimensions() AB.MicroHeight = (((_G["CharacterMicroButton"]:GetHeight() + spacing) * numRows) - spacing) + (offset * 2) E:Size(ElvUI_MicroBar, AB.MicroWidth, AB.MicroHeight) + if self.db.microbar.enabled then + ElvUI_MicroBar:Show() + else + ElvUI_MicroBar:Hide() + end + if ElvUI_MicroBar.mover then if self.db.microbar.enabled then - ElvUI_MicroBar:Show() E:EnableMover(ElvUI_MicroBar.mover:GetName()) else - ElvUI_MicroBar:Hide() E:DisableMover(ElvUI_MicroBar.mover:GetName()) end end @@ -118,8 +142,8 @@ end function AB:SetupMicroBar() E:Point(ElvUI_MicroBar, "TOPLEFT", E.UIParent, "TOPLEFT", 4, -48) ElvUI_MicroBar:EnableMouse(true) - ElvUI_MicroBar:SetScript("OnEnter", onEnter) - ElvUI_MicroBar:SetScript("OnLeave", onLeave) + ElvUI_MicroBar:SetScript("OnEnter", onEnterBar) + ElvUI_MicroBar:SetScript("OnLeave", onLeaveBar) for i = 1, getn(MICRO_BUTTONS) do self:HandleMicroButton(_G[MICRO_BUTTONS[i]])