From ed09414ddb6b26ea9367d70c26bffd93904a55ac Mon Sep 17 00:00:00 2001
From: AntlerForce <124457076+AntlerForce@users.noreply.github.com>
Date: Sat, 30 Mar 2024 17:15:55 -0700
Subject: [PATCH] Revert "New top bar graphic, text, and bigger buttons for
 leave/resume game"

---
 LuaMenu/images/top-background.png             | Bin 5656 -> 176 bytes
 .../chobby/components/interface_root.lua      |  40 +++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/LuaMenu/images/top-background.png b/LuaMenu/images/top-background.png
index 7d3f739301564c1ed31f8beac81795266cdbbb35..5fca0338d7a3abed31e3b5edcb46882f63eb49f9 100644
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH
z=l+w(3gmMZctjR6Fz~5@Fe85$%S50cdx@v7EBga>UVbf&(-G5vA`DU`t`Q}{`DrEP
ziAAXl0g0J;C3=3YAqr*2dZv1Y1_ob>76MiAc)B=-NQ5W<`2XLYf%PBLzvZTlEg<cl
Lu6{1-oD!M<@h>bY

literal 5656
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

diff --git a/LuaMenu/widgets/chobby/components/interface_root.lua b/LuaMenu/widgets/chobby/components/interface_root.lua
index 426b86a26..a98e2c21e 100644
--- a/LuaMenu/widgets/chobby/components/interface_root.lua
+++ b/LuaMenu/widgets/chobby/components/interface_root.lua
@@ -46,7 +46,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 	local statusButtonWidth = 265
 	local statusButtonWidthSmall = 265
 
-	local topBarHeight = 49
+	local topBarHeight = 42
 
 	-- Switch to single panel mode when below the minimum screen width
 	local minScreenWidth = 1350
@@ -909,10 +909,6 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 	-- Top bar initialisation
 	-------------------------------------------------------------------
 
-	local function LeaveGameFunction()
-		Spring.Reload("")
-	end
-
 	local switchToMenuButton = Button:New {
 		y = 2,
 		right = 3,
@@ -920,7 +916,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 		height = 38,
 		name = "switchToMenuButton",
 		caption = "Menu",
-		objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
+		objectOverrideFont = WG.Chobby.Configuration:GetFont(2),
 		parent = ingameInterfaceHolder,
 		resizable = false,
 		draggable = false,
@@ -933,13 +929,14 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 		}
 	}
 	local switchToGameButton = Button:New {
-		x = "50.12%",
-		right = "30%",
-		y = 3,
-		bottom = 9,
+		y = 2,
+		right = 3,
+		width = 150,
+		height = 38,
 		name = "switchToGameButton",
-		caption = "Return to Battle",
-		objectOverrideFont = WG.Chobby.Configuration:GetFont(5),
+		caption = "Back to Game",
+		captionHorAlign = 5,
+		objectOverrideFont = WG.Chobby.Configuration:GetFont(2),
 		parent = holder_topBar,
 		resizable = false,
 		draggable = false,
@@ -951,14 +948,19 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 			end
 		}
 	}
+
+	local function LeaveGameFunction()
+		Spring.Reload("")
+	end
+
 	local leaveGameButton = Button:New {
-		x = "30%",
-		right = "50.12%",
-		y = 3,
-		bottom = 9,
+		y = 2,
+		right = 156,
+		width = 108,
+		height = 38,
 		name = "leaveGameButton",
-		caption = "Leave Battle",
-		objectOverrideFont = WG.Chobby.Configuration:GetFont(5),
+		caption = "Leave",
+		objectOverrideFont = WG.Chobby.Configuration:GetFont(2),
 		parent = holder_topBar,
 		resizable = false,
 		draggable = false,
@@ -979,7 +981,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
 		file = IMAGE_TOP_BACKGROUND,
 		parent = holder_topBar,
 		keepAspect = false,
-		color = {1, 1, 1, 0.87},
+		color = {0, 0, 0, 0.0},
 	}
 
 	-------------------------------------------------------------------