fix: can't click anything in the world in 11.1

ascott18 · Jan 9, 2025 · 4387684 · 4387684
1 parent 25569cb
commit 4387684
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v11.1.0
+* Fixes for WoW 11.1
+
 ## v11.0.13
 * Fix: #2250 - Currency checking error in Cata clasic
 

diff --git a/Components/Core/Common/IconDragger.lua b/Components/Core/Common/IconDragger.lua
@@ -25,7 +25,7 @@ TMW.IconDragger = IconDragger
 
 
 function IconDragger:OnInitialize()
-	WorldFrame:HookScript("OnMouseDown", function() -- this contains other bug fix stuff too
+	TMW:RegisterCallback("TMW_WORLD_FRAME_MOUSE_DOWN", function()
 		IconDragger.DraggerFrame:Hide()
 		IconDragger.IsDragging = nil
 	end)
@@ -102,7 +102,7 @@ function IconDragger:CompleteDrag(script, icon)
 	IconDragger:ScheduleTimer("SetIsDraggingFalse", 0.1)
 
 	-- icon is the destination
-	icon = icon or (GetMouseFoci and GetMouseFoci()[1] or GetMouseFocus())
+	icon = icon or TMW.GetMouseFocus() or WorldFrame
 
 	if IconDragger.IsDragging then
 

diff --git a/Components/Core/Utils.lua b/Components/Core/Utils.lua
@@ -1353,6 +1353,11 @@ end
 -- WoW API Helpers
 ---------------------------------
 
+local GetMouseFoci = GetMouseFoci
+TMW.GetMouseFocus = GetMouseFocus or function()
+	return GetMouseFoci()[1]
+end
+
 function TMW.GetRuneCooldownDuration()
 	-- Round to a precision of 3 decimal points for comparison with returns from GetSpellCooldown
 	local _, duration = GetRuneCooldown(1)

diff --git a/Components/IconModules/IconModule_GroupMover/module.lua b/Components/IconModules/IconModule_GroupMover/module.lua
@@ -79,8 +79,7 @@ end)
 -- Sometimes, if a group/icon does some things to itself while moving
 -- (Hiding/Showing seems to trigger this), OnDragStop won't fire when it should.
 -- Having these here makes sure that the user doesn't get a group permanantly stuck to their cursor.
-
-WorldFrame:HookScript("OnMouseDown", function(WorldFrame, button)
+TMW:RegisterCallback("TMW_WORLD_FRAME_MOUSE_DOWN", function()
 	if isMoving then
 		stopMoving(isMoving)
 	end

diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua
@@ -3,6 +3,9 @@ if not TMW then return end
 TMW.CHANGELOG_LASTVER="10.0.0"
 
 TMW.CHANGELOG = [==[
+## v11.1.0
+* Fixes for WoW 11.1
+
 ## v11.0.13
 * Fix: #2250 - Currency checking error in Cata clasic
 

diff --git a/Options/TMWUIDropDownMenu.lua b/Options/TMWUIDropDownMenu.lua
@@ -740,8 +740,7 @@ function DD:GetScrollable()
 	return self.scrollable
 end
 
-
-WorldFrame:HookScript("OnMouseDown", function()
+TMW:RegisterCallback("TMW_WORLD_FRAME_MOUSE_DOWN", function()
 	DD:CloseDropDownMenus()
 end)
 

diff --git a/Options/TellMeWhen_Options.lua b/Options/TellMeWhen_Options.lua
@@ -267,8 +267,8 @@ function IE:OnInitialize()
 		-- WoW 11.0+
 		hooksecurefunc(C_SpellBook, "PickupSpellBookItem", function(...) IE.DraggingInfo = {...} end)
 	end
-
-	WorldFrame:HookScript("OnMouseDown", function()
+	
+	TMW:RegisterCallback("TMW_WORLD_FRAME_MOUSE_DOWN", function()
 		IE.DraggingInfo = nil
 	end)
 	hooksecurefunc("ClearCursor", IE.BAR_HIDEGRID)

diff --git a/TellMeWhen-Cata.toc b/TellMeWhen-Cata.toc
@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.0.13
+## Version: 11.1.0
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick

diff --git a/TellMeWhen-Classic.toc b/TellMeWhen-Classic.toc
@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.0.13
+## Version: 11.1.0
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick

diff --git a/TellMeWhen.lua b/TellMeWhen.lua
@@ -1091,6 +1091,7 @@ function TMW:PLAYER_LOGIN()
 	TMW:UpdateTalentTextureCache()
 
 
+	TMW:RegisterEvent("GLOBAL_MOUSE_DOWN")
 
 	if C_BarberShop then
 		TMW:RegisterEvent("BARBER_SHOP_OPEN")
@@ -2970,7 +2971,12 @@ function TMW:BARBER_SHOP_CLOSE()
 	TMW:Show()
 end
 
-
+function TMW:GLOBAL_MOUSE_DOWN(button)
+	local mouseFocus = TMW.GetMouseFocus()
+	if not mouseFocus or mouseFocus == WorldFrame then
+		TMW:Fire("TMW_WORLD_FRAME_MOUSE_DOWN", button)
+	end
+end
 
 
 

diff --git a/TellMeWhen.toc b/TellMeWhen.toc
@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.0.13
+## Version: 11.1.0
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick