mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 18:42:56 +08:00
Expose carousel's loaded flag
This commit is contained in:
parent
6058f994e1
commit
e2503888a4
@ -55,9 +55,9 @@ namespace osu.Game.Screens.Select
|
||||
public override bool HandlePositionalInput => AllowSelection;
|
||||
|
||||
/// <summary>
|
||||
/// Used to avoid firing null selections before the initial beatmaps have been loaded via <see cref="BeatmapSets"/>.
|
||||
/// Whether carousel items have completed asynchronously loaded.
|
||||
/// </summary>
|
||||
private bool initialLoadComplete;
|
||||
public bool BeatmapSetsLoaded { get; private set; }
|
||||
|
||||
private IEnumerable<CarouselBeatmapSet> beatmapSets => root.Children.OfType<CarouselBeatmapSet>();
|
||||
|
||||
@ -90,7 +90,7 @@ namespace osu.Game.Screens.Select
|
||||
Schedule(() =>
|
||||
{
|
||||
BeatmapSetsChanged?.Invoke();
|
||||
initialLoadComplete = true;
|
||||
BeatmapSetsLoaded = true;
|
||||
});
|
||||
}));
|
||||
}
|
||||
@ -593,7 +593,7 @@ namespace osu.Game.Screens.Select
|
||||
currentY += DrawHeight / 2;
|
||||
scrollableContent.Height = currentY;
|
||||
|
||||
if (initialLoadComplete && (selectedBeatmapSet == null || selectedBeatmap == null || selectedBeatmapSet.State.Value != CarouselItemState.Selected))
|
||||
if (BeatmapSetsLoaded && (selectedBeatmapSet == null || selectedBeatmap == null || selectedBeatmapSet.State.Value != CarouselItemState.Selected))
|
||||
{
|
||||
selectedBeatmapSet = null;
|
||||
SelectionChanged?.Invoke(null);
|
||||
|
Loading…
Reference in New Issue
Block a user