h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 10:53:10 +08:00
Code Issues Releases Wiki Activity

Ensure a selection is made on entering song select if no selection is current

Browse Source
This commit is contained in:
Dean Herbert 2017-12-24 17:02:46 +09:00
parent a04ebd0595
commit 482e10966c
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/TestCasePlaySongSelect.cs
View File

@ -100,9 +100,6 @@ namespace osu.Game.Tests.Visual
manager.Import(createTestBeatmapSet(i)); manager.Import(createTestBeatmapSet(i));
}); });
AddWaitStep(1);
AddStep("select random", () => songSelect.Carousel.SelectNextRandom());
AddWaitStep(1); AddWaitStep(1);
AddAssert("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap); AddAssert("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);

4
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -75,7 +75,8 @@ namespace osu.Game.Screens.Select
scrollableContent.Clear(false); scrollableContent.Clear(false);
itemsCache.Invalidate(); itemsCache.Invalidate();
scrollPositionCache.Invalidate(); scrollPositionCache.Invalidate();
BeatmapSetsChanged?.Invoke();
Schedule(() => BeatmapSetsChanged?.Invoke());
})); }));
} }
} }
@ -154,6 +155,7 @@ namespace osu.Game.Screens.Select
select((CarouselItem)newSet.Beatmaps.FirstOrDefault(b => b.Beatmap.ID == selectedBeatmap?.Beatmap.ID) ?? newSet); select((CarouselItem)newSet.Beatmaps.FirstOrDefault(b => b.Beatmap.ID == selectedBeatmap?.Beatmap.ID) ?? newSet);
itemsCache.Invalidate(); itemsCache.Invalidate();
Schedule(() => BeatmapSetsChanged?.Invoke());
}); });
} }

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -423,7 +423,7 @@ namespace osu.Game.Screens.Select
private void carouselBeatmapsLoaded() private void carouselBeatmapsLoaded()
{ {
if (Beatmap.Value.BeatmapSetInfo?.DeletePending == false) if (!Beatmap.IsDefault && Beatmap.Value.BeatmapSetInfo?.DeletePending == false)
Carousel.SelectBeatmap(Beatmap.Value.BeatmapInfo); Carousel.SelectBeatmap(Beatmap.Value.BeatmapInfo);
else else
Carousel.SelectNextRandom(); Carousel.SelectNextRandom();