esc menu changes

ElvUI/Init.lua

@@ -19,10 +19,9 @@ local InCombatLockdown = InCombatLockdown
 local IsAddOnLoaded = IsAddOnLoaded
 local LoadAddOn = LoadAddOn
 local ReloadUI = ReloadUI
+local EscapeMenu = EscapeMenu
 
 local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT
-local GameMenuButtonLogout = GameMenuButtonLogout
-local GameMenuFrame = GameMenuFrame
 
 BINDING_HEADER_ELVUI = GetAddOnMetadata(..., "Title")
 
@@ -178,34 +177,9 @@ function AddOn:OnInitialize()
 		self:StaticPopup_Show("TUKUI_ELVUI_INCOMPATIBLE")
 	end
 
-	local GameMenuButton = CreateFrame("Button", "ElvUI_MenuButton", GameMenuFrame, "GameMenuButtonTemplate")
-	GameMenuButton:SetText(self.title)
-	GameMenuButton:SetScript("OnClick", function()
+	local GameMenuButton = EscapeMenu:AddButton(self.title, EscapeMenuSection.AddOns, function()
 		AddOn:ToggleOptionsUI()
-		HideUIPanel(GameMenuFrame)
-	end)
-	GameMenuFrame[AddOnName] = GameMenuButton
-
-	GameMenuButton:Size(GameMenuButtonLogout:GetWidth(), GameMenuButtonLogout:GetHeight())
-	GameMenuButtonRatings:HookScript("OnShow", function(self)
-		GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() + self:GetHeight())
-	end)
-	GameMenuButtonRatings:HookScript("OnHide", function(self)
-		GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() - self:GetHeight())
-	end)
-
-	GameMenuFrame:HookScript("OnShow", function()
-		if not GameMenuFrame.isElvUI then
-			GameMenuFrame:SetHeight(GameMenuFrame:GetHeight() + GameMenuButtonLogout:GetHeight() + 1)
-			GameMenuFrame.isElvUI = true
-		end
-		local _, relTo = GameMenuButtonLogout:GetPoint()
-		if relTo ~= GameMenuFrame[AddOnName] then
-			GameMenuFrame[AddOnName]:ClearAllPoints()
-			GameMenuFrame[AddOnName]:Point("TOPLEFT", relTo, "BOTTOMLEFT", 0, -1)
-			GameMenuButtonLogout:ClearAllPoints()
-			GameMenuButtonLogout:Point("TOPLEFT", GameMenuFrame[AddOnName], "BOTTOMLEFT", 0, -16)
-		end
+		return true
 	end)
 
 	self.loadedtime = GetTime()

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