skin spellbook flyouts again

Author: kodewdle

ElvUI/Core/Modules/ActionBars/ActionBars.lua

@@ -944,8 +944,13 @@ do
 			button.OnIconEnter = AB.SpellButtonOnEnter
 			button.OnIconLeave = AB.SpellButtonOnLeave
 
-			if button.Button then -- the icon enter
-				button.Button:HookScript('OnEnter', BindOnEnter)
+			local spellButton = button.Button
+			if spellButton then -- actual spell button
+				if spellButton.BorderShadow then
+					spellButton.BorderShadow:SetAlpha(0)
+				end
+
+				spellButton:HookScript('OnEnter', BindOnEnter)
 			end
 		else
 			if button.OnEnter == AB.SpellButtonOnEnter then
@@ -1502,10 +1507,13 @@ function AB:SpellFlyout_OnLeave()
 end
 
 function AB:UpdateFlyoutButtons()
-	if _G.LABFlyoutHandlerFrame then _G.LABFlyoutHandlerFrame.Background:Hide() end
+	if _G.LABFlyoutHandlerFrame then
+		_G.LABFlyoutHandlerFrame.Background:Hide()
+	end
 
-	local isShown = _G.SpellFlyout:IsShown()
-	local btn, i = _G['SpellFlyoutButton1'], 1
+	local isShown, i = _G.SpellFlyout:IsShown(), 1
+	local flyoutName = E.Retail and 'SpellFlyoutPopupButton' or 'SpellFlyoutButton'
+	local btn = _G[flyoutName..i]
 	while btn do
 		if isShown then
 			AB:SetupFlyoutButton(btn)
@@ -1518,13 +1526,21 @@ function AB:UpdateFlyoutButtons()
 		end
 
 		i = i + 1
-		btn = _G['SpellFlyoutButton'..i]
+		btn = _G[flyoutName..i]
 	end
 end
 
+function AB:HideFlyoutShadow(button)
+	if button.BorderShadow then button.BorderShadow:SetAlpha(0) end
+	if button.FlyoutBorder then button.FlyoutBorder:SetAlpha(0) end
+	if button.FlyoutBorderShadow then button.FlyoutBorderShadow:SetAlpha(0) end
+end
+
 function AB:SetupFlyoutButton(button)
 	if not AB.handledbuttons[button] then
 		AB:StyleButton(button, nil, FlyoutMasqueGroup and E.private.actionbar.masque.actionbars)
+		AB:HideFlyoutShadow(button)
+
 		button:HookScript('OnEnter', AB.FlyoutButton_OnEnter)
 		button:HookScript('OnLeave', AB.FlyoutButton_OnLeave)
 	end
@@ -1540,9 +1556,6 @@ function AB:SetupFlyoutButton(button)
 end
 
 function AB:StyleFlyout(button, arrow)
-	if button.FlyoutBorder then button.FlyoutBorder:SetAlpha(0) end
-	if button.FlyoutBorderShadow then button.FlyoutBorderShadow:SetAlpha(0) end
-
 	local bar = button:GetParent()
 	local barName = bar:GetName()
 
@@ -1554,6 +1567,8 @@ function AB:StyleFlyout(button, arrow)
 	if not arrow then arrow = btn.FlyoutArrow or (btn.GetArrowRotation and btn.Arrow) or (btn.FlyoutArrowContainer and btn.FlyoutArrowContainer.FlyoutArrowNormal) end
 	if not arrow then return end
 
+	AB:HideFlyoutShadow(button)
+
 	if barName == 'SpellBookSpellIconsFrame' or ownerName == 'SpellBookSpellIconsFrame' then
 		local distance = (_G.SpellFlyout and _G.SpellFlyout:IsShown() and _G.SpellFlyout:GetParent() == parent) and 7 or 4
 		arrow:ClearAllPoints()

ElvUI/Mainline/Modules/Skins/SpellBook.lua

@@ -10,6 +10,8 @@ local GetProfessionInfo = GetProfessionInfo
 local C_SpellBook_GetSpellBookItemInfo = C_SpellBook.GetSpellBookItemInfo
 local SpellBookSpellBank = Enum.SpellBookSpellBank
 
+local barColor = { 0, .86, 0 }
+
 local function clearBackdrop(self)
 	self:SetBackdropColor(0, 0, 0, 1)
 end
@@ -66,6 +68,7 @@ end
 
 local function HandleSkillButton(button)
 	if not button then return end
+
 	button:SetCheckedTexture(E.media.normTex)
 	button:GetCheckedTexture():SetColorTexture(1, 1, 1, .25)
 	button:SetPushedTexture(E.media.normTex)
@@ -96,7 +99,6 @@ function S:Blizzard_ProfessionsBook()
 	end
 
 	--Profession Tab
-	local barColor = {0, .86, 0}
 	for _, button in next, { _G.PrimaryProfession1, _G.PrimaryProfession2, _G.SecondaryProfession1, _G.SecondaryProfession2, _G.SecondaryProfession3 } do
 		button.missingHeader:SetTextColor(1, 1, 0)
 		button.missingText:SetTextColor(1, 1, 1)

ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua

@@ -270,16 +270,6 @@ local DefaultConfig = {
 	},
 }
 
--- Helper function to prevent calls on Blizzards side
-local function CreateDummyPopup(frame)
-	local popup = frame or CreateFrame('Frame')
-
-	popup.AttachToButton = noop
-	popup.DetatchFromButton = noop
-
-	return popup
-end
-
 --- Create a new action button.
 -- @param id Internal id of the button (not used by LibActionButton-1.0, only for tracking inside the calling addon)
 -- @param name Name of the button frame to be created (not used by LibActionButton-1.0 aside from naming the frame)
@@ -304,8 +294,6 @@ function lib:CreateButton(id, name, header, config)
 		button:RegisterForClicks("AnyUp")
 	end
 
-	button.popup = CreateDummyPopup()
-
 	button.cooldown:SetFrameStrata(button:GetFrameStrata())
 	button.cooldown:SetFrameLevel(button:GetFrameLevel() + 1)
 
@@ -1152,8 +1140,6 @@ if UseCustomFlyout then
 			for i = #lib.FlyoutButtons + 1, maxNumSlots do
 				local button = lib:CreateButton(i, "LABFlyoutButton" .. i, lib.flyoutHandler, nil)
 
-				button.popup = CreateDummyPopup()
-
 				button:SetScale(0.8)
 				button:Hide()