RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Dean Herbert 2017-08-01 11:34:59 +09:00 committed by GitHub
parent bb3a8a29ea ab4be26ec3
commit fc7f9cbae2
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,12 +187,12 @@ public void SelectNextRandom()
if (groups.Count == 0)
return;
randomSelectedBeatmaps.Push(new KeyValuePair<BeatmapGroup, BeatmapPanel>(selectedGroup, selectedGroup.SelectedPanel));
var visibleGroups = getVisibleGroups();
if (!visibleGroups.Any())
return;
randomSelectedBeatmaps.Push(new KeyValuePair<BeatmapGroup, BeatmapPanel>(selectedGroup, selectedGroup.SelectedPanel));
BeatmapGroup group;
if (randomType == SelectionRandomType.RandomPermutation)
@ -287,6 +287,12 @@ public void Filter(FilterCriteria newCriteria = null, bool debounce = true)
perform();
}
public void ScrollToSelected(bool animated = true)
{
float selectedY = computeYPositions(animated);
ScrollTo(selectedY, animated);
}
private BeatmapGroup createGroup(BeatmapSetInfo beatmapSet)
{
foreach (var b in beatmapSet.Beatmaps)
@ -426,8 +432,7 @@ private void selectGroup(BeatmapGroup group, BeatmapPanel panel = null, bool ani
}
finally
{
float selectedY = computeYPositions(animated);
ScrollTo(selectedY, animated);
ScrollToSelected(animated);
}
}

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

@ -129,6 +129,11 @@ protected SongSelect()
Right = left_area_padding,
},
});
Add(new ResetScrollContainer(() => carousel.ScrollToSelected())
{
RelativeSizeAxes = Axes.Y,
Width = 250,
});
if (ShowFooter)
{
@ -414,5 +419,21 @@ protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
return base.OnKeyDown(state, args);
}
private class ResetScrollContainer : Container
{
private readonly Action onHoverAction;
public ResetScrollContainer(Action onHoverAction)
{
this.onHoverAction = onHoverAction;
}
protected override bool OnHover(InputState state)
{
onHoverAction?.Invoke();
return base.OnHover(state);
}
}
}
}