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

Fixed the asynchronous map loading behavior when changing filter

Browse Source
This commit is contained in:
Carko
2013-01-13 20:32:06 +01:00
committed by Chris Forbes
parent 4395a04d57
commit 50ceb7c4dd
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.RA/Widgets/Logic/MapChooserLogic.cs
View File

@@ -22,6 +22,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
ScrollPanelWidget scrollpanel; ScrollPanelWidget scrollpanel;
ScrollItemWidget itemTemplate; ScrollItemWidget itemTemplate;
string gameMode; string gameMode;
Thread mapLoaderThread;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
internal MapChooserLogic(Widget widget, string initialMap, Action onExit, Action<Map> onSelect) internal MapChooserLogic(Widget widget, string initialMap, Action onExit, Action<Map> onSelect)
@@ -54,7 +55,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ {
var item = ScrollItemWidget.Setup(template, var item = ScrollItemWidget.Setup(template,
() => gameMode == ii.First, () => gameMode == ii.First,
() => { gameMode = ii.First; EnumerateMaps(); }); () => { gameMode = ii.First; EnumerateMapsAsync(); });
item.Get<LabelWidget>("LABEL").GetText = () => showItem(ii); item.Get<LabelWidget>("LABEL").GetText = () => showItem(ii);
return item; return item;
}; };
@@ -65,12 +66,21 @@ namespace OpenRA.Mods.RA.Widgets.Logic
gameModeDropdown.GetText = () => showItem(gameModes.First(m => m.First == gameMode)); gameModeDropdown.GetText = () => showItem(gameModes.First(m => m.First == gameMode));
} }
new Thread(EnumerateMaps).Start(); EnumerateMapsAsync();
}
void EnumerateMapsAsync()
{
if (mapLoaderThread != null && mapLoaderThread.IsAlive)
mapLoaderThread.Abort(); // violent, but should be fine since we are not doing anything sensitive in this thread
mapLoaderThread = new Thread(EnumerateMaps);
mapLoaderThread.Start();
} }
void EnumerateMaps() void EnumerateMaps()
{ {
scrollpanel.RemoveChildren(); Game.RunAfterTick(() => scrollpanel.RemoveChildren()); // queue removal in case another thread added any items to the game queue
scrollpanel.Layout = new GridLayout(scrollpanel); scrollpanel.Layout = new GridLayout(scrollpanel);
scrollpanel.ScrollToTop(); scrollpanel.ScrollToTop();