sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-31 02:17:34 +09:00
Code Issues Packages Projects Releases Wiki Activity

Handle the case where the selected panel is no longer a valid selection better

Browse Source
This commit is contained in:
Dean Herbert 2017-12-11 21:31:26 +09:00
parent fb92b3551e
commit b10240d7ef
2 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
View File

@ -47,8 +47,14 @@ namespace osu.Game.Beatmaps.Drawables
set set
{ {
state = value; state = value;
UpdateState();
StateChanged?.Invoke(state);
}
}
switch (value) public void UpdateState()
{
switch (state)
{ {
case BeatmapGroupState.Expanded: case BeatmapGroupState.Expanded:
Header.State = PanelSelectedState.Selected; Header.State = PanelSelectedState.Selected;
@ -67,9 +73,6 @@ namespace osu.Game.Beatmaps.Drawables
panel.State = PanelSelectedState.Hidden; panel.State = PanelSelectedState.Hidden;
break; break;
} }
StateChanged?.Invoke(state);
}
} }
public BeatmapGroup(BeatmapSetInfo beatmapSet, BeatmapManager manager) public BeatmapGroup(BeatmapSetInfo beatmapSet, BeatmapManager manager)

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

@ -327,6 +327,8 @@ namespace osu.Game.Screens.Select
computeYPositions(); computeYPositions();
selectedGroup?.UpdateState();
if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden) if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden)
SelectNext(); SelectNext();
else else
@ -441,11 +443,13 @@ namespace osu.Game.Screens.Select
panel.MoveToX(-50, 500, Easing.OutExpo); panel.MoveToX(-50, 500, Easing.OutExpo);
bool isHidden = panel.State == PanelSelectedState.Hidden;
//on first display we want to begin hidden under our group's header. //on first display we want to begin hidden under our group's header.
if (panel.Filtered || panel.Alpha == 0) if (isHidden || panel.Alpha == 0)
panel.MoveToY(headerY); panel.MoveToY(headerY);
movePanel(panel, !panel.Filtered, animated, ref currentY); movePanel(panel, !isHidden, animated, ref currentY);
} }
} }
else else
@ -479,7 +483,7 @@ namespace osu.Game.Screens.Select
{ {
try try
{ {
if (panel == null) if (panel == null || panel.Filtered == true)
panel = group.BeatmapPanels.First(p => !p.Filtered); panel = group.BeatmapPanels.First(p => !p.Filtered);
if (selectedPanel == panel) return; if (selectedPanel == panel) return;