From 228399f91383283f84f5ad5a815533e9e8e8bc9e Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Mon, 19 Feb 2018 14:51:20 +0000
Subject: [PATCH] Add the lobby button to the summary screen.

Patch By: fpre / ffffffff
Differential Revision: https://code.wildfiregames.com/D1272
Refs #4106

This was SVN commit r21263.
---
 .../data/mods/public/gui/page_summary.xml     |  1 +
 .../data/mods/public/gui/summary/summary.js   |  3 +++
 .../data/mods/public/gui/summary/summary.xml  | 22 +++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/binaries/data/mods/public/gui/page_summary.xml b/binaries/data/mods/public/gui/page_summary.xml
index 30a7d7e22c..4ae37d3df4 100644
--- a/binaries/data/mods/public/gui/page_summary.xml
+++ b/binaries/data/mods/public/gui/page_summary.xml
@@ -4,6 +4,7 @@
 	<include>common/modern/styles.xml</include>
 	<include>common/modern/sprites.xml</include>
 
+	<include>common/sprites.xml</include>
 	<include>common/global.xml</include>
 
 	<include>summary/summary.xml</include>
diff --git a/binaries/data/mods/public/gui/summary/summary.js b/binaries/data/mods/public/gui/summary/summary.js
index d2296dec66..409b14d1f9 100644
--- a/binaries/data/mods/public/gui/summary/summary.js
+++ b/binaries/data/mods/public/gui/summary/summary.js
@@ -530,6 +530,9 @@ function initGUILabelsAndButtons()
 		});
 
 	Engine.GetGUIObjectByName("replayButton").hidden = g_GameData.gui.isInGame || !g_GameData.gui.replayDirectory;
+
+	Engine.GetGUIObjectByName("lobbyButton").tooltip = colorizeHotkey(translate("%(hotkey)s: Toggle the multiplayer lobby in a dialog window."), "lobby");
+	Engine.GetGUIObjectByName("lobbyButton").hidden = g_GameData.gui.isInGame || !Engine.HasXmppClient();
 }
 
 function initTeamData()
diff --git a/binaries/data/mods/public/gui/summary/summary.xml b/binaries/data/mods/public/gui/summary/summary.xml
index 7379631495..cd98715b2b 100644
--- a/binaries/data/mods/public/gui/summary/summary.xml
+++ b/binaries/data/mods/public/gui/summary/summary.xml
@@ -26,13 +26,6 @@
 
 	<object type="image" sprite="ModernFade" name="fadeImage"/>
 
-	<object hotkey="lobby">
-		<action on="Press">
-			if (Engine.HasXmppClient())
-				Engine.PushGuiPage("page_lobby.xml", { "dialog": true });
-		</action>
-	</object>
-
 	<object name="summaryWindow"
 		type="image"
 		style="ModernWindow"
@@ -215,6 +208,21 @@
 			<object name="chartLegend" type="text" style="ModernLabelText" size="15 100%-35 100%-15 100%-5"/>
 		</object>
 
+		<!-- View Lobby Button -->
+		<object name="lobbyButton"
+			type="button"
+			sprite="iconBubbleGold"
+			sprite_over="iconBubbleWhite"
+			size="100%-336 100%-45 100%-320 100%-29"
+			hidden="true"
+			hotkey="lobby"
+		>
+			<action on="Press">
+				if (Engine.HasXmppClient())
+					Engine.PushGuiPage("page_lobby.xml", { "dialog": true });
+			</action>
+		</object>
+
 		<object type="button" name="replayButton" style="ModernButtonRed" size="100%-310 100%-48 100%-170 100%-20">
 			<translatableAttribute id="caption">Replay</translatableAttribute>
 			<action on="Press">confirmStartReplay();</action>