Improve usability and fix some issues with hotkey remap dialog

OpenRA.Mods.Common/Widgets/HotkeyEntryWidget.cs

@@ -24,10 +24,7 @@ public class HotkeyEntryWidget : Widget
 		public int LeftMargin = 5;
 		public int RightMargin = 5;
 
-		public Action OnTakeFocus = () => { };
 		public Action OnLoseFocus = () => { };
-		public Action OnEscape = () => { };
-		public Action OnReturn = () => { };
 
 		public Func<bool> IsDisabled = () => false;
 		public Func<bool> IsValid = () => false;
@@ -49,7 +46,6 @@ protected HotkeyEntryWidget(HotkeyEntryWidget widget)
 
 		public override bool TakeKeyboardFocus()
 		{
-			OnTakeFocus();
 			return base.TakeKeyboardFocus();
 		}
 
@@ -62,6 +58,12 @@ public override bool YieldKeyboardFocus()
 			return base.YieldKeyboardFocus();
 		}
 
+		public bool ForceYieldKeyboardFocus()
+		{
+			OnLoseFocus();
+			return base.YieldKeyboardFocus();
+		}
+
 		public override bool HandleMouseInput(MouseInput mi)
 		{
 			if (IsDisabled())
@@ -95,15 +97,9 @@ public override bool HandleKeyPress(KeyInput e)
 			if (!HasKeyboardFocus || IgnoreKeys.Contains(e.Key))
 				return false;
 
-			if (e.Key != Keycode.ESCAPE && e.Key != Keycode.RETURN)
+			if (e.Key != Keycode.ESCAPE && e.Key != Keycode.RETURN && e.Key != Keycode.KP_ENTER)
 				Key = Hotkey.FromKeyInput(e);
 
-			if (e.Key == Keycode.ESCAPE)
-				OnEscape();
-
-			if (e.Key == Keycode.RETURN)
-				OnReturn();
-
 			YieldKeyboardFocus();
 
 			return true;