From e663a404603208c2a7b97bb4c40c5afd53df268d Mon Sep 17 00:00:00 2001 From: Meow <30401521+me0wg4ming@users.noreply.github.com> Date: Sun, 22 Mar 2026 12:32:05 +0100 Subject: [PATCH] Revert "Fix invisible frames intercepting mouse clicks" This reverts commit 7d0898c56321612dc0f80400a8008958a3a03b31. --- api/ui-widgets.lua | 2 +- modules/infight.lua | 1 - modules/turtle-wow.lua | 80 ++++++++++++------------------------------ 3 files changed, 23 insertions(+), 60 deletions(-) diff --git a/api/ui-widgets.lua b/api/ui-widgets.lua index ba8dec6b..3abc6765 100644 --- a/api/ui-widgets.lua +++ b/api/ui-widgets.lua @@ -115,7 +115,7 @@ do -- statusbars function pfUI.api.CreateStatusBar(name, parent) local f = CreateFrame("Button", name, parent) - f:EnableMouse(false) + f:EnableMouse(nil) f.bar = f:CreateTexture(nil, "NORMAL") f.bar:SetPoint("TOPLEFT", f, "TOPLEFT", 0, 0) diff --git a/modules/infight.lua b/modules/infight.lua index 03ed2111..95531a8e 100644 --- a/modules/infight.lua +++ b/modules/infight.lua @@ -31,7 +31,6 @@ pfUI:RegisterModule("infight", "vanilla:tbc", function () pfUI.infight.screen = CreateFrame("Frame", "pfUICombatScreen", WorldFrame) pfUI.infight.screen:SetAllPoints(WorldFrame) - pfUI.infight.screen:EnableMouse(false) pfUI.infight.screen:Hide() pfUI.infight.UpdateConfig = function(self) diff --git a/modules/turtle-wow.lua b/modules/turtle-wow.lua index c2ecd508..43fc303a 100644 --- a/modules/turtle-wow.lua +++ b/modules/turtle-wow.lua @@ -23,61 +23,6 @@ pfUI:RegisterModule("turtle-wow", "vanilla", function () -- Set GROUP_REPLACE_PARTY early so Turtle's own init can use it GROUP_REPLACE_PARTY = "1" - -- Disable Turtle GroupUI cluster frames and member frames so they - -- cannot intercept mouse clicks meant for pfUI unit frames or nameplates. - local function DisableTurtleGroupFrames() - GROUP_ENABLED = "0" - - -- Stop GroupFrame from firing events that re-show cluster frames - GroupFrame:UnregisterAllEvents() - GroupFrame:Hide() - - for i = 1, 8 do - local f = _G["GroupClusterFrame"..i] - if f then - f:Hide() - f:EnableMouse(false) - -- Disable mouse on all child member frames (Buttons with click handlers) - for _, child in pairs({f:GetChildren()}) do - child:EnableMouse(false) - end - end - end - if GroupPetsClusterFrame then - GroupPetsClusterFrame:Hide() - GroupPetsClusterFrame:EnableMouse(false) - end - end - - local function EnableTurtleGroupFrames() - GROUP_ENABLED = "1" - GROUP_REPLACE_PARTY = "1" - - -- Re-enable mouse on cluster frames and their children - for i = 1, 8 do - local f = _G["GroupClusterFrame"..i] - if f then - f:EnableMouse(true) - for _, child in pairs({f:GetChildren()}) do - child:EnableMouse(true) - end - end - end - if GroupPetsClusterFrame then - GroupPetsClusterFrame:EnableMouse(true) - end - - GroupFrame:RegisterEvent("PARTY_MEMBERS_CHANGED") - GroupFrame:RegisterEvent("RAID_ROSTER_UPDATE") - GroupFrame:RegisterEvent("RAID_TARGET_UPDATE") - GroupFrame:RegisterEvent("UNIT_NAME_UPDATE") - GroupFrame:RegisterEvent("UNIT_PET") - GroupFrame:RegisterEvent("PLAYER_TARGET_CHANGED") - GroupFrame:RegisterEvent("CHAT_MSG_ADDON") - GroupFrame:Show() - GroupFrame_Update() - end - HookAddonOrVariable("GroupFrame", function() hooksecurefunc("GroupFrame_Toggle", function() local inRaid = (GetNumRaidMembers() > 0) @@ -89,9 +34,24 @@ pfUI:RegisterModule("turtle-wow", "vanilla", function () end if pfUIHandles then - DisableTurtleGroupFrames() + GROUP_ENABLED = "0" + for i = 1, 8 do + local f = _G["GroupClusterFrame"..i] + if f then f:Hide() end + end + if GroupPetsClusterFrame then GroupPetsClusterFrame:Hide() end else - EnableTurtleGroupFrames() + GROUP_ENABLED = "1" + GROUP_REPLACE_PARTY = "1" + GroupFrame:RegisterEvent("PARTY_MEMBERS_CHANGED") + GroupFrame:RegisterEvent("RAID_ROSTER_UPDATE") + GroupFrame:RegisterEvent("RAID_TARGET_UPDATE") + GroupFrame:RegisterEvent("UNIT_NAME_UPDATE") + GroupFrame:RegisterEvent("UNIT_PET") + GroupFrame:RegisterEvent("PLAYER_TARGET_CHANGED") + GroupFrame:RegisterEvent("CHAT_MSG_ADDON") + GroupFrame:Show() + GroupFrame_Update() end end) @@ -105,7 +65,11 @@ pfUI:RegisterModule("turtle-wow", "vanilla", function () end if pfUIHandles then - DisableTurtleGroupFrames() + for i = 1, 8 do + local f = _G["GroupClusterFrame"..i] + if f then f:Hide() end + end + if GroupPetsClusterFrame then GroupPetsClusterFrame:Hide() end end end) end)