fixed pushedtexture when modifier is used

1onar · Oct 27, 2024 · b0d7e40 · b0d7e40
1 parent 953db6d
commit b0d7e40
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/KeyUI.lua b/KeyUI.lua
@@ -1258,6 +1258,10 @@ eventFrame:SetScript("OnEvent", function(self, event, ...)
                     if addon.current_hovered_button then
                         addon:ButtonMouseOver(addon.current_hovered_button)
                     end
+
+                    if addon.current_pushed_button then
+                        addon.current_pushed_button:Hide()
+                    end
                 end
             end
         else

diff --git a/KeyboardFrame.lua b/KeyboardFrame.lua
@@ -910,7 +910,7 @@ function addon:CreateKeyboardButtons()
 
     -- Define the mouse hover behavior to show tooltips.
     keyboard_button:SetScript("OnEnter", function()
-        addon.current_hovered_button = keyboard_button --save the current hovered button to re-trigger tooltip
+        addon.current_hovered_button = keyboard_button -- save the current hovered button to re-trigger tooltip
         addon:ButtonMouseOver(keyboard_button)
         keyboard_button:EnableKeyboard(true)
         keyboard_button:EnableMouseWheel(true)
@@ -953,6 +953,8 @@ function addon:CreateKeyboardButtons()
                         local pushedTexture = mappedButton:GetPushedTexture()
                         if pushedTexture then
                             pushedTexture:Show() -- Show the pushed texture
+                            addon.current_pushed_button = pushedTexture -- save the current pushed button to hide when modifier pushed
+                            print(pushedTexture)
                         end
                     end
                 end
@@ -990,6 +992,7 @@ function addon:CreateKeyboardButtons()
                     local pushedTexture = mappedButton:GetPushedTexture()
                     if pushedTexture then
                         pushedTexture:Hide() -- Hide the pushed texture
+                        addon.current_pushed_button = nil -- Clear the current pushed button
                     end
                 end
             end

diff --git a/MouseFrame.lua b/MouseFrame.lua
@@ -653,7 +653,7 @@ function addon:CreateMouseButtons()
     mouse_button.icon:SetPoint("TOPLEFT", mouse_button, "TOPLEFT", 5, -5)
 
     mouse_button:SetScript("OnEnter", function()
-        addon.current_hovered_button = mouse_button --save the current hovered button to re-trigger tooltip
+        addon.current_hovered_button = mouse_button -- save the current hovered button to re-trigger tooltip
         addon:ButtonMouseOver(mouse_button)
         mouse_button:EnableKeyboard(true)
         mouse_button:EnableMouseWheel(true)
@@ -696,7 +696,7 @@ function addon:CreateMouseButtons()
                         local pushedTexture = mappedButton:GetPushedTexture()
                         if pushedTexture then
                             pushedTexture:Show() -- Show the pushed texture
-                            --print("Showing PushedTexture for button in slot", Mousebutton.slot)
+                            addon.current_pushed_button = pushedTexture -- save the current pushed button to hide when modifier pushed
                         end
                     end
                 end
@@ -735,7 +735,7 @@ function addon:CreateMouseButtons()
                     local pushedTexture = mappedButton:GetPushedTexture()
                     if pushedTexture then
                         pushedTexture:Hide() -- Hide the pushed texture
-                        --print("Hiding PushedTexture for button in slot", Mousebutton.slot)
+                        addon.current_pushed_button = nil -- Clear the current pushed button
                     end
                 end
             end