From 38f8bb85aaa83dd9b3492deefa5fbc4b7d174ffc Mon Sep 17 00:00:00 2001
From: andrew6180 <16847730+andrew6180@users.noreply.github.com>
Date: Tue, 30 Apr 2024 02:17:37 -0700
Subject: [PATCH] EscapeMenu changes

---
 MoveAnything/MoveAnything.lua | 23 +++++++++++++++--------
 MoveAnything/MoveAnything.xml | 17 -----------------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/MoveAnything/MoveAnything.lua b/MoveAnything/MoveAnything.lua
index 5f4d7ae..209d366 100644
--- a/MoveAnything/MoveAnything.lua
+++ b/MoveAnything/MoveAnything.lua
@@ -335,8 +335,8 @@ MovAny = {
 		MAOptions = {
 			{"MAOptions", "ARTWORK","BORDER"},
 		},
-		GameMenuFrame = {
-			{"GameMenuFrame", "BACKGROUND","ARTWORK","BORDER"},
+		EscapeMenu = {
+			{"EscapeMenu", "BACKGROUND","ARTWORK","BORDER"},
 		},
 		MainMenuBar = {
 			{"MainMenuBarArtFrame", "BACKGROUND","ARTWORK"},
@@ -422,7 +422,6 @@ MovAny = {
 	lAllowedMAFrames = {
 		MAOptions = "MAOptions",
 		MANudger = "MANudger",
-		GameMenuButtonMoveAnything = "GameMenuButtonMoveAnything",
 	},
 	DefaultFrameList = {
 		{"", "Achievements & Quests"},
@@ -538,7 +537,7 @@ MovAny = {
 		{"FocusFrameToTDebuff1", "Target of Focus Debuffs"},
 
 		{"", "Game Menu"},
-		{"GameMenuFrame", "Game Menu"},
+		{"EscapeMenu", "Game Menu"},
 		{"VideoOptionsFrame", "Video Options"},
 		{"AudioOptionsFrame", "Sound & Voice Options"},
 		{"InterfaceOptionsFrame", "Interface Options"},
@@ -639,7 +638,6 @@ MovAny = {
 		{"", "MoveAnything"},
 		{"MAOptions", "MoveAnything Window"},
 		{"MANudger", "MoveAnything Nudger"},
-		{"GameMenuButtonMoveAnything", "MoveAnything Game Menu Button"},
 
 		{"", "Party"},
 		{"PartyMemberFrame1", "Party Member 1"},
@@ -705,7 +703,7 @@ MovAny = {
 				opt = MovAny:GetFrameOptions(fn)
 				if opt and opt.UIPanelWindows then
 					f = _G[fn]
-					if f ~= nil and f ~= GameMenuFrame then
+					if f ~= nil and f ~= EscapeMenu then
 						if f.IsShown and f:IsShown() then
 							if InCombatLockdown() and MovAny:IsProtected(f) then
 								local closure = function(f)
@@ -4179,7 +4177,7 @@ function MovAny:ApplyPosition(f, opt)
 			end
 		end
 		
-		if UIPanelWindows[fn] and f ~= GameMenuFrame then
+		if UIPanelWindows[fn] and f ~= EscapeMenu then
 			local left = GetUIPanel("left")
 			local center = GetUIPanel("center")
 
@@ -5633,4 +5631,13 @@ function MovAny:SerializeAtom(o)
 	else
 		return o
 	end
-end
\ No newline at end of file
+end
+
+EscapeMenu:AddButton("MoveAnything!", EscapeMenuSection.AddOns, function()
+	if IsShiftKeyDown() and IsControlKeyDown() and IsAltKeyDown() then
+		ReloadUI()
+	else
+		ShowUIPanel(MAOptions)
+		return true
+	end
+end)
\ No newline at end of file
diff --git a/MoveAnything/MoveAnything.xml b/MoveAnything/MoveAnything.xml
index 7020c01..6b19e05 100644
--- a/MoveAnything/MoveAnything.xml
+++ b/MoveAnything/MoveAnything.xml
@@ -1,22 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
 ..\FrameXML\UI.xsd">
-	<Button name="GameMenuButtonMoveAnything" parent="GameMenuFrame" inherits="GameMenuButtonTemplate" text="MoveAnything!">
-		<Scripts>
-			<OnLoad>
-				self:ClearAllPoints()
-				self:SetPoint("TOP", GameMenuButtonContinue, "BOTTOM", 0, -25)
-			</OnLoad>
-			<OnClick>
-				if IsShiftKeyDown() and IsControlKeyDown() and IsAltKeyDown() then
-					ReloadUI()
-				else
-					ShowUIPanel(MAOptions)
-					HideUIPanel(GameMenuFrame)
-				end
-			</OnClick>
-		</Scripts>
-	</Button>
-
 	<Button name="MAResizeButton" virtual="true">
 		<Size>
 			<AbsDimension x="8" y="8"/>