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

Prioritize alerted tabs when switching group / via hotkey.

Browse Source
This commit is contained in:
Paul Chote
2011-07-17 15:29:35 +12:00
parent 1bafd35d61
commit ac7c25efa3
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenRA.Mods.Cnc/Widgets/ProductionTabsWidget.cs
View File

@@ -90,6 +90,22 @@ namespace OpenRA.Mods.Cnc.Widgets
Widget.RootWidget.GetWidget<ProductionPaletteWidget>(PaletteWidget)); Widget.RootWidget.GetWidget<ProductionPaletteWidget>(PaletteWidget));
} }
public void SelectNextTab(bool reverse)
{
if (queueGroup == null)
return;
// Prioritize alerted queues
var queues = Groups[queueGroup].Tabs.Select(t => t.Queue)
.OrderByDescending(q => q.CurrentDone ? 1 : 0)
.ToList();
if (reverse) queues.Reverse();
CurrentQueue = queues.SkipWhile(q => q != CurrentQueue)
.Skip(1).FirstOrDefault() ?? queues.FirstOrDefault();
}
public string QueueGroup public string QueueGroup
{ {
get get
@@ -99,9 +115,8 @@ namespace OpenRA.Mods.Cnc.Widgets
set set
{ {
ListOffset = 0; ListOffset = 0;
queueGroup = value;
// TODO: prioritize alerted tabs SelectNextTab(false);
CurrentQueue = Groups[value].Tabs[0].Queue;
} }
} }
@@ -184,16 +199,12 @@ namespace OpenRA.Mods.Cnc.Widgets
// Queue destroyed, was last of type: switch to a new group // Queue destroyed, was last of type: switch to a new group
if (Groups[queueGroup].Tabs.Count == 0) if (Groups[queueGroup].Tabs.Count == 0)
{ QueueGroup = Groups.Where(g => g.Value.Tabs.Count > 0)
// Find a new group
var qg = Groups.Where(g => g.Value.Tabs.Count > 0)
.Select(g => g.Key).FirstOrDefault(); .Select(g => g.Key).FirstOrDefault();
CurrentQueue = qg != null ? Groups[qg].Tabs[0].Queue : null;
}
// Queue destroyed, others of same type: switch to another tab // Queue destroyed, others of same type: switch to another tab
else if (!Groups[queueGroup].Tabs.Select(t => t.Queue).Contains(CurrentQueue)) else if (!Groups[queueGroup].Tabs.Select(t => t.Queue).Contains(CurrentQueue))
CurrentQueue = Groups[queueGroup].Tabs[0].Queue; SelectNextTab(false);
} }
} }
@@ -272,19 +283,5 @@ namespace OpenRA.Mods.Cnc.Widgets
return false; return false;
} }
public void SelectNextTab(bool reverse)
{
if (queueGroup == null)
return;
var tabs = Groups[queueGroup].Tabs.ToList();
if (reverse) tabs.Reverse();
var tab = tabs.SkipWhile(q => q.Queue != CurrentQueue)
.Skip(1).FirstOrDefault() ?? tabs.FirstOrDefault();
CurrentQueue = tab != null ? tab.Queue : null;
}
} }
} }