fix tt using mod key to show spell id when ab module off

tukui-org · Nov 7, 2024 · c680068 · c680068
1 parent 71c92f8
commit c680068
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua
@@ -1017,14 +1017,15 @@ function AB:SpellButtonOnEnter(_, tt)
 	local slotBank = self.spellBank or (_G.SpellBookFrame and _G.SpellBookFrame.bookType)
 	if not (slotIndex and slotBank) then return end -- huh?
 
+	local needsUpdate = tt:SetSpellBookItem(slotIndex, slotBank) -- need this here when its GameTooltip
+
 	local highlight = self.SpellHighlightTexture
 	if highlight and highlight:IsShown() then
 		local color = _G.LIGHTBLUE_FONT_COLOR
 		tt:AddLine(_G.SPELLBOOK_SPELL_NOT_ON_ACTION_BAR, color.r, color.g, color.b)
 	end
 
 	if tt == E.SpellBookTooltip then
-		local needsUpdate = tt:SetSpellBookItem(slotIndex, slotBank)
 		tt:SetScript('OnUpdate', (needsUpdate and AB.SpellBookTooltipOnUpdate) or nil)
 	end
 

diff --git a/ElvUI/Core/Modules/Tooltip/Tooltip.lua b/ElvUI/Core/Modules/Tooltip/Tooltip.lua
@@ -840,12 +840,12 @@ function TT:MODIFIER_STATE_CHANGED()
 			end
 		else
 			local parent = owner and owner:GetParent()
-			if E.Retail then
-				if parent and parent.slotIndex then
+			if parent then
+				if parent.slotIndex then
 					AB.SpellButtonOnEnter(parent, nil, GameTooltip)
+				elseif parent == _G.SpellBookSpellIconsFrame then
+					AB.SpellButtonOnEnter(owner, nil, GameTooltip)
 				end
-			elseif parent and parent == _G.SpellBookSpellIconsFrame then
-				AB.SpellButtonOnEnter(owner, nil, GameTooltip)
 			end
 		end
 	end