Merge pull request #614 from AntlerForce/master

New top bar graphic, text, and bigger buttons for leave/resume game

LuaMenu/widgets/chobby/components/interface_root.lua

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