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

don't hardcode SHIFT modifier for backwards tab cycle

Browse Source 
closes #4144
This commit is contained in:
Matthias Mailänder
2013-12-07 11:44:01 +01:00
parent 28cf6d36f4
commit bcba26a04e
4 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs Executable file → Normal file
View File

@@ -89,10 +89,12 @@ namespace OpenRA.Mods.Cnc.Widgets
paletteWidget = Lazy.New(() => Ui.Root.Get<ProductionPaletteWidget>(PaletteWidget));
}
public void SelectNextTab(bool reverse)
public bool SelectNextTab(bool reverse)
{
if (queueGroup == null)
return;
return true;
Sound.PlayNotification(null, "Sounds", "ClickSound", null);
// Prioritize alerted queues
var queues = Groups[queueGroup].Tabs.Select(t => t.Queue)
@@ -103,6 +105,8 @@ namespace OpenRA.Mods.Cnc.Widgets
CurrentQueue = queues.SkipWhile(q => q != CurrentQueue)
.Skip(1).FirstOrDefault() ?? queues.FirstOrDefault();
return true;
}
public string QueueGroup
@@ -277,12 +281,12 @@ namespace OpenRA.Mods.Cnc.Widgets
if (e.Event != KeyInputEvent.Down)
return false;
if (Hotkey.FromKeyInput(e) == Game.Settings.Keys.CycleTabsKey)
{
Sound.PlayNotification(null, "Sounds", "ClickSound", null);
SelectNextTab(e.Modifiers.HasModifier(Modifiers.Shift));
return true;
}
var hotkey = Hotkey.FromKeyInput(e);
if (hotkey == Game.Settings.Keys.NextProductionTabKey)
return SelectNextTab(false);
else if (hotkey == Game.Settings.Keys.PreviousProductionTabKey)
return SelectNextTab(true);
return false;
}