Add HotkeyReference.IsActivatedBy method.

2017-11-05 20:03:27 +00:00
parent c4237d6a1a
commit 811427adc4
14 changed files with 33 additions and 41 deletions
--- a/OpenRA.Mods.Common/Widgets/Logic/SingleHotkeyBaseLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/SingleHotkeyBaseLogic.cs
@@ -30,11 +30,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 			keyhandler.AddHandler(e =>
 			{
 				if (e.Event == KeyInputEvent.Down)
-				{
-					var key = Hotkey.FromKeyInput(e);
-					if (key == namedKey.GetValue())
+					if (namedKey.IsActivatedBy(e))
 						return OnHotkeyActivated(e);
-				}

 				return false;
 			});