Improves Esc key behavior in lobby and asset browser.

Pressing Esc will now close window if text field is empty.
OpenRA · Jun 8, 2015 · ca5ebb5 · ca5ebb5
1 parent b5262dc
commit ca5ebb5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 13 deletions.
diff --git a/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
@@ -52,6 +52,16 @@ public AssetBrowserLogic(Widget widget, Action onExit, World world)
 			panel = widget;
 			assetSource = GlobalFileSystem.MountedFolders.First();
 
+			var closeButton = panel.GetOrNull<ButtonWidget>("CLOSE_BUTTON");
+			if (closeButton != null)
+				closeButton.OnClick = () =>
+				{
+					if (isVideoLoaded)
+						player.Stop();
+					Ui.CloseWindow();
+					onExit();
+				};
+
 			var ticker = panel.GetOrNull<LogicTickerWidget>("ANIMATION_TICKER");
 			if (ticker != null)
 			{
@@ -113,8 +123,14 @@ public AssetBrowserLogic(Widget widget, Action onExit, World world)
 			filenameInput.OnTextEdited = () => ApplyFilter(filenameInput.Text);
 			filenameInput.OnEscKey = () =>
 			{
-				filenameInput.Text = null;
-				filenameInput.OnTextEdited();
+				if (filenameInput.Text.Length == 0)
+					closeButton.OnClick();
+				else
+				{
+					filenameInput.Text = null;
+					filenameInput.OnTextEdited();
+				}
+
 				return true;
 			};
 			var frameContainer = panel.GetOrNull("FRAME_SELECTOR");
@@ -220,16 +236,6 @@ public AssetBrowserLogic(Widget widget, Action onExit, World world)
 			assetList = panel.Get<ScrollPanelWidget>("ASSET_LIST");
 			template = panel.Get<ScrollItemWidget>("ASSET_TEMPLATE");
 			PopulateAssetList();
-
-			var closeButton = panel.GetOrNull<ButtonWidget>("CLOSE_BUTTON");
-			if (closeButton != null)
-				closeButton.OnClick = () =>
-				{
-					if (isVideoLoaded)
-						player.Stop();
-					Ui.CloseWindow();
-					onExit();
-				};
 		}
 
 		void SelectNextFrame()

diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
@@ -547,7 +547,15 @@ void CloseWindow()
 				else
 					return true;
 			};
-			chatTextField.OnEscKey = () => { chatTextField.Text = null; return true; };
+			chatTextField.OnEscKey = () =>
+			{
+				if (chatTextField.Text.Length == 0)
+					disconnectButton.OnClick();
+				else
+					chatTextField.Text = null;
+
+				return true;
+			};
 
 			chatPanel = lobby.Get<ScrollPanelWidget>("CHAT_DISPLAY");
 			chatTemplate = chatPanel.Get("CHAT_TEMPLATE");