esc menu changes

ElvUI/Modules/DataTexts/System.lua

@@ -141,12 +141,10 @@ local function UpdateCPU()
 end
 
 local function ToggleGameMenuFrame()
-	if GameMenuFrame:IsShown() then
-		PlaySound("igMainMenuQuit")
-		HideUIPanel(GameMenuFrame)
+	if EscapeMenu:IsShown() then
+		HideUIPanel(EscapeMenu)
 	else
-		PlaySound("igMainMenuOpen")
-		ShowUIPanel(GameMenuFrame)
+		ShowUIPanel(EscapeMenu)
 	end
 end
 

ElvUI/Modules/Maps/Minimap.lua

@@ -99,12 +99,10 @@ local menuList = {
 		text = MAINMENU_BUTTON,
 		notCheckable = 1,
 		func = function()
-			if GameMenuFrame:IsShown() then
-				PlaySound("igMainMenuQuit")
-				HideUIPanel(GameMenuFrame)
+			if EscapeMenu:IsShown() then
+				HideUIPanel(EscapeMenu)
 			else
-				PlaySound("igMainMenuOpen")
-				ShowUIPanel(GameMenuFrame)
+				ShowUIPanel(EscapeMenu)
 			end
 		end
 	},

ElvUI/Modules/Skins/Blizzard/Misc.lua

@@ -11,30 +11,14 @@ S:AddCallback("Skin_Misc", function()
 	if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.misc then return end
 
 	-- ESC/Menu Buttons
-	GameMenuFrame:StripTextures()
-	GameMenuFrame:CreateBackdrop("Transparent")
+	EscapeMenu:StripTextures()
+	EscapeMenu:CreateBackdrop("Transparent")
 
-	GameMenuFrameHeader:Point("TOP", 0, 7)
+	EscapeMenuHeader:Point("TOP", 0, 7)
 
-	local menuButtons = {
-		GameMenuButtonOptions,
-		GameMenuButtonSoundOptions,
-		GameMenuButtonUIOptions,
-	--	GameMenuButtonMacOptions,
-		GameMenuButtonKeybindings,
-		GameMenuButtonMacros,
-	--	GameMenuButtonRatings,
-		GameMenuButtonLogout,
-		GameMenuButtonQuit,
-		GameMenuButtonContinue,
-
-		ElvUI_MenuButton
-	}
-
-	for i = 1, #menuButtons do
-		local button = menuButtons[i]
-		if button then
-			S:HandleButton(menuButtons[i])
+	for _, section in ipairs(EscapeMenu.sections) do
+		for _, button in ipairs(section) do
+			S:HandleButton(button)
 		end
 	end