h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 09:32:55 +08:00
Code Issues 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
commit daad16b5e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 4 deletions
Show Stats 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)
{
AddWaitStep("wait for fade", 1);
waitForLoad();
AddAssert("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0);
selectNext(mod);
AddWaitStep("wait for fade", 1);
waitForLoad();
AddAssert("check for unranked", () => modSelect.UnrankedLabel.Alpha != 0);
selectPrevious(mod);
AddWaitStep("wait for fade", 1);
waitForLoad();
AddAssert("check for ranked", () => modSelect.UnrankedLabel.Alpha == 0);
}
@ -232,6 +232,7 @@ namespace osu.Game.Tests.Visual.UserInterface
private void checkSelected(Mod mod)
{
waitForLoad();
AddAssert($"check {mod.Name} is selected", () =>
{
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)
{
waitForLoad();
AddAssert($"check {mod.Name} is not selected", () =>
{
var button = modSelect.GetModButton(mod);
@ -254,6 +261,8 @@ namespace osu.Game.Tests.Visual.UserInterface
{
public new Bindable<IReadOnlyList<Mod>> SelectedMods => base.SelectedMods;
public bool AllLoaded => ModSectionsContainer.Children.All(c => c.ModIconsLoaded);
public ModButton GetModButton(Mod mod)
{
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.Linq;
using System.Collections.Generic;
using System.Threading;
using osu.Framework.Input.Events;
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);
private CancellationTokenSource modsLoadCts;
/// <summary>
/// True when all mod icons have completed loading.
/// </summary>
public bool ModIconsLoaded { get; private set; } = true;
public IEnumerable<Mod> Mods
{
set
@ -48,7 +56,15 @@ namespace osu.Game.Overlays.Mods
};
}).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();
if (value.Any())