epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add HotkeyReference.IsActivatedBy method.

Browse Source
This commit is contained in:
Paul Chote
2017-11-05 20:03:27 +00:00
committed by abcdefg30
parent c4237d6a1a
commit 811427adc4
14 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs
View File

@@ -148,8 +148,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{
if (e.Event == KeyInputEvent.Down && !e.IsRepeat)
{
var h = Hotkey.FromKeyInput(e);
if (h == combinedViewKey.GetValue() && !limitViews)
if (combinedViewKey.IsActivatedBy(e) && !limitViews)
{
selected = combined;
selected.OnClick();
@@ -157,7 +156,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return true;
}
if (h == worldViewKey.GetValue() && !limitViews)
if (worldViewKey.IsActivatedBy(e) && !limitViews)
{
selected = disableShroud;
selected.OnClick();