Merge pull request #2810 from bidifx/cancel-chat

cancel ingame-chat with esc
2013-03-20 17:18:18 -07:00
parent 89228cd484 d53dcc859f
commit 38f0d722c6
2 changed files with 9 additions and 1 deletions
--- a/1
+++ b/1
@@ -44,6 +44,7 @@ Also thanks to:
 	* Psydev
 	* Raymond Martineau	(mart0258)
 	* Riderr3
+	* Sascha Biedermann	(bidifx)
 	* Tim Mylemans		(gecko)
 	* Tirili
 	* Vladimir Komarov	(VrKomarov)
--- a/OpenRA.Game/Widgets/ChatEntryWidget.cs
+++ b/OpenRA.Game/Widgets/ChatEntryWidget.cs
@@ -79,7 +79,14 @@ namespace OpenRA.Widgets

 			if (composing)
 			{
-				if (e.KeyName == "backspace")
+				if (e.KeyName == "escape")
+				{
+					composing = false;
+					content = "";
+					LoseFocus();
+					return true;
+				}
+				else if (e.KeyName == "backspace")
 				{
 					if (content.Length > 0)
 						content = content.Remove(content.Length - 1);