h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:13:00 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix-info-wedge

Browse Source
This commit is contained in:
Dean Herbert 2017-12-23 21:40:27 +09:00
commit 8e644e878a
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
View File

@ -69,6 +69,7 @@ namespace osu.Game.Tests.Visual
testSorting(); testSorting();
testRemoveAll(); testRemoveAll();
testEmptyTraversal();
} }
private void ensureRandomFetchSuccess() => private void ensureRandomFetchSuccess() =>
@ -103,6 +104,8 @@ namespace osu.Game.Tests.Visual
AddAssert($"{count} {(diff ? "diffs" : "sets")} visible", () => AddAssert($"{count} {(diff ? "diffs" : "sets")} visible", () =>
carousel.Items.Count(s => (diff ? s.Item is CarouselBeatmap : s.Item is CarouselBeatmapSet) && s.Item.Visible) == count); carousel.Items.Count(s => (diff ? s.Item is CarouselBeatmap : s.Item is CarouselBeatmapSet) && s.Item.Visible) == count);
private void checkNoSelection() => AddAssert("Selection is null", () => currentSelection == null);
private void nextRandom() => private void nextRandom() =>
AddStep("select random next", () => AddStep("select random next", () =>
{ {
@ -274,9 +277,23 @@ namespace osu.Game.Tests.Visual
return false; return false;
}, "Remove all"); }, "Remove all");
AddAssert("Selection is null", () => currentSelection == null); checkNoSelection();
} }
private void testEmptyTraversal()
{
advanceSelection(direction: 1, diff: false);
checkNoSelection();
advanceSelection(direction: 1, diff: true);
checkNoSelection();
advanceSelection(direction: -1, diff: false);
checkNoSelection();
advanceSelection(direction: -1, diff: true);
checkNoSelection();
}
private BeatmapSetInfo createTestBeatmapSet(int i) private BeatmapSetInfo createTestBeatmapSet(int i)
{ {

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

@ -181,6 +181,9 @@ namespace osu.Game.Screens.Select
/// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param> /// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param>
public void SelectNext(int direction = 1, bool skipDifficulties = true) public void SelectNext(int direction = 1, bool skipDifficulties = true)
{ {
if (!Items.Any())
return;
int originalIndex = Items.IndexOf(selectedBeatmap?.Drawables.First()); int originalIndex = Items.IndexOf(selectedBeatmap?.Drawables.First());
int currentIndex = originalIndex; int currentIndex = originalIndex;