sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 00:09:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5083 from peppy/modselect-async-improvements

Browse Source 
Fix mod icons in ModSelect being loaded in a blocking fashion
This commit is contained in:
Dan Balasescu
2019-06-21 11:53:17 +09:00
committed by GitHub
parent cd52dbf1a7 6deee968ac
commit daad16b5e7
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Tests/Visual/UserInterface/TestSceneModSelectOverlay.cs
View File

@ -216,13 +216,13 @@ namespace osu.Game.Tests.Visual.UserInterface
private void testRankedText(Mod mod) private void testRankedText(Mod mod)
{ {
AddWaitStep("wait for fade", 1); waitForLoad();
AddAssert("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0); AddAssert("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0);
selectNext(mod); selectNext(mod);
AddWaitStep("wait for fade", 1); waitForLoad();
AddAssert("check for unranked", () => modSelect.UnrankedLabel.Alpha != 0); AddAssert("check for unranked", () => modSelect.UnrankedLabel.Alpha != 0);
selectPrevious(mod); selectPrevious(mod);
AddWaitStep("wait for fade", 1); waitForLoad();
AddAssert("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0); AddAssert("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0);
} }
@ -232,6 +232,7 @@ namespace osu.Game.Tests.Visual.UserInterface
private void checkSelected(Mod mod) private void checkSelected(Mod mod)
{ {
waitForLoad();
AddAssert($"check {mod.Name} is selected", () => AddAssert($"check {mod.Name} is selected", () =>
{ {
var button = modSelect.GetModButton(mod); var button = modSelect.GetModButton(mod);
@ -239,8 +240,14 @@ namespace osu.Game.Tests.Visual.UserInterface
}); });
} }
private void waitForLoad()
{
AddUntilStep("wait for icons to load", () => modSelect.AllLoaded);
}
private void checkNotSelected(Mod mod) private void checkNotSelected(Mod mod)
{ {
waitForLoad();
AddAssert($"check {mod.Name} is not selected", () => AddAssert($"check {mod.Name} is not selected", () =>
{ {
var button = modSelect.GetModButton(mod); var button = modSelect.GetModButton(mod);
@ -254,6 +261,8 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods; public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
public bool AllLoaded => ModSectionsContainer.Children.All(c => c.ModIconsLoaded);
public ModButton GetModButton(Mod mod) public ModButton GetModButton(Mod mod)
{ {
var section = ModSectionsContainer.Children.Single(s => s.ModType == mod.Type); var section = ModSectionsContainer.Children.Single(s => s.ModType == mod.Type);

18
osu.Game/Overlays/Mods/ModSection.cs
View File

@ -10,6 +10,7 @@ using osu.Game.Rulesets.Mods;
using System; using System;
using System.Linq; using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -33,6 +34,13 @@ namespace osu.Game.Overlays.Mods
public IEnumerable<Mod> SelectedMods => buttons.Select(b => b.SelectedMod).Where(m => m != null); public IEnumerable<Mod> SelectedMods => buttons.Select(b => b.SelectedMod).Where(m => m != null);
private CancellationTokenSource modsLoadCts;
/// <summary>
/// True when all mod icons have completed loading.
/// </summary>
public bool ModIconsLoaded { get; private set; } = true;
public IEnumerable<Mod> Mods public IEnumerable<Mod> Mods
{ {
set set
@ -48,7 +56,15 @@ namespace osu.Game.Overlays.Mods
}; };
}).ToArray(); }).ToArray();
ButtonsContainer.Children = modContainers; modsLoadCts?.Cancel();
ModIconsLoaded = false;
LoadComponentsAsync(modContainers, c =>
{
ModIconsLoaded = true;
ButtonsContainer.ChildrenEnumerable = c;
}, (modsLoadCts = new CancellationTokenSource()).Token);
buttons = modContainers.OfType<ModButton>().ToArray(); buttons = modContainers.OfType<ModButton>().ToArray();
if (value.Any()) if (value.Any())