Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix song select reverting to first difficulty of current group on entering #778

Merged
merged 3 commits into from May 17, 2017
Merged

Fix song select reverting to first difficulty of current group on entering #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cab12ee
Reduce the possibility of recomputing drawables when underlying beatm…
peppy May 17, 2017
7bb38e9
Fix song select reverting to first difficulty of current group on ent…
peppy May 17, 2017
25f2175
Merge branch 'master' into song-select-selection-fixes
peppy May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion osu.Game/Screens/Select/BeatmapCarousel.cs
View file
Open in desktop
Expand Up @@ -107,6 +107,8 @@ public void SelectBeatmap(BeatmapInfo beatmap, bool animated = true)
return;
}

if (beatmap == SelectedBeatmap) return;

foreach (BeatmapGroup group in groups)
{
var panel = group.BeatmapPanels.FirstOrDefault(p => p.Beatmap.Equals(beatmap));
Expand Down Expand Up @@ -204,7 +206,7 @@ public void Filter(FilterCriteria newCriteria = null, bool debounce = true)
if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden)
SelectNext();
else
selectGroup(selectedGroup);
selectGroup(selectedGroup, selectedPanel);
};

filterTask?.Cancel();
Expand Down Expand Up @@ -339,6 +341,8 @@ private void selectGroup(BeatmapGroup group, BeatmapPanel panel = null, bool ani
selectedGroup.State = BeatmapGroupState.Collapsed;

group.State = BeatmapGroupState.Expanded;
group.SelectedPanel = panel;

panel.State = PanelSelectedState.Selected;

if (selectedPanel == panel) return;
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Screens/Select/BeatmapDetails.cs
View file
Open in desktop
Expand Up @@ -49,6 +49,8 @@ public BeatmapInfo Beatmap
get { return beatmap; }
set
{
if (beatmap == value) return;

beatmap = value;

pendingBeatmapSwitch?.Cancel();
Expand Down
2 changes: 2 additions & 0 deletions osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View file
Open in desktop
Expand Up @@ -100,6 +100,8 @@ public BeatmapInfo Beatmap
get { return beatmap; }
set
{
if (beatmap == value) return;

beatmap = value;
Scores = null;

Expand Down
16 changes: 8 additions & 8 deletions osu.Game/Screens/Select/SongSelect.cs
View file
Open in desktop
Expand Up @@ -313,15 +313,15 @@ private void selectionChanged(BeatmapInfo beatmap)
{
bool beatmapSetChange = false;

if (!beatmap.Equals(Beatmap?.BeatmapInfo))
if (beatmap.Equals(Beatmap?.BeatmapInfo))
return;

if (beatmap.BeatmapSetInfoID == selectionChangeNoBounce?.BeatmapSetInfoID)
sampleChangeDifficulty.Play();
else
{
if (beatmap.BeatmapSetInfoID == selectionChangeNoBounce?.BeatmapSetInfoID)
sampleChangeDifficulty.Play();
else
{
sampleChangeBeatmap.Play();
beatmapSetChange = true;
}
sampleChangeBeatmap.Play();
beatmapSetChange = true;
}

selectionChangeNoBounce = beatmap;
Expand Down