h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-23 22:44:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #35178 from bdach/song-select-loses-selection-if-convert

Browse Source 
Fix selection being changed on re-entering song select when a converted beatmap is selected
This commit is contained in:
Dean Herbert
2025-10-06 15:53:42 +09:00
committed by GitHub
Unverified
parent dd8dfc04b3 3d5dc60cfe
commit 71ae1d34cd
2 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Navigation/TestSceneSongSelectNavigation.cs
+33
View File
@@ -9,6 +9,7 @@ using osu.Framework.Extensions;
using osu.Framework.Extensions.TypeExtensions;
using osu.Framework.Testing;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Leaderboards;
using osu.Game.Overlays;
@@ -18,6 +19,7 @@ using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Screens;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Footer;
using osu.Game.Screens.Menu;
using osu.Game.Screens.Play;
using osu.Game.Screens.Ranking;
using osu.Game.Screens.SelectV2;
@@ -238,6 +240,37 @@ namespace osu.Game.Tests.Visual.Navigation
});
}
[Test]
public void TestSelectionNotLostWithConvertedBeatmapsShown()
{
BeatmapSetInfo beatmapSet = null!;
BeatmapInfo selectedBeatmap = null!;
AddStep("import beatmap", () => beatmapSet = BeatmapImportHelper.LoadOszIntoOsu(Game).GetResultSafely());
PushAndConfirm(() => new SoloSongSelect());
AddUntilStep("wait for selected", () => !Game.Beatmap.IsDefault);
AddStep("change ruleset to taiko", () =>
{
InputManager.PressKey(Key.ControlLeft);
InputManager.Key(Key.Number2);
InputManager.ReleaseKey(Key.ControlLeft);
});
AddStep("show converts", () => Game.LocalConfig.SetValue(OsuSetting.ShowConvertedBeatmaps, true));
AddStep("select osu! beatmap", () =>
{
selectedBeatmap = beatmapSet.Beatmaps.First(b => b.Ruleset.OnlineID == 0);
Game.Beatmap.Value = Game.BeatmapManager.GetWorkingBeatmap(selectedBeatmap);
});
pushEscape();
AddUntilStep("went back to main menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
PushAndConfirm(() => new SoloSongSelect());
AddUntilStep("selected beatmap is still osu! ruleset", () => Game.Beatmap.Value.BeatmapInfo, () => Is.EqualTo(selectedBeatmap));
}
private Func<Player> playToResults()
{
var player = playToCompletion();
osu.Game/Screens/SelectV2/SongSelect.cs
+10 -11
View File
@@ -155,6 +155,7 @@ namespace osu.Game.Screens.SelectV2
private readonly RealmPopulatingOnlineLookupSource onlineLookupSource = new RealmPopulatingOnlineLookupSource();
private Bindable<bool> configBackgroundBlur = null!;
private Bindable<bool> showConvertedBeatmaps = null!;
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuConfigManager config)
@@ -302,6 +303,8 @@ namespace osu.Game.Screens.SelectV2
updateBackgroundDim();
});
showConvertedBeatmaps = config.GetBindable<bool>(OsuSetting.ShowConvertedBeatmaps);
}
private void requestRecommendedSelection(IEnumerable<GroupedBeatmap> groupedBeatmaps)
@@ -522,7 +525,7 @@ namespace osu.Game.Screens.SelectV2
if (!this.IsCurrentScreen())
return;
if (!checkBeatmapValidForSelection(beatmap, carousel.Criteria))
if (!checkBeatmapValidForSelection(beatmap))
return;
// To ensure sanity, cancel any pending selection as we are about to force a selection.
@@ -573,7 +576,7 @@ namespace osu.Game.Screens.SelectV2
// Refetch to be confident that the current selection is still valid. It may have been deleted or hidden.
var currentBeatmap = beatmaps.GetWorkingBeatmap(Beatmap.Value.BeatmapInfo, true);
bool validSelection = checkBeatmapValidForSelection(currentBeatmap.BeatmapInfo, filterControl.CreateCriteria());
bool validSelection = checkBeatmapValidForSelection(currentBeatmap.BeatmapInfo);
if (validSelection)
{
@@ -594,9 +597,8 @@ namespace osu.Game.Screens.SelectV2
{
// In the case a difficulty was hidden or removed, prefer selecting another difficulty from the same set.
var activeSet = currentBeatmap.BeatmapSetInfo;
var criteria = filterControl.CreateCriteria();
var validBeatmaps = activeSet.Beatmaps.Where(b => checkBeatmapValidForSelection(b, criteria)).ToArray();
var validBeatmaps = activeSet.Beatmaps.Where(checkBeatmapValidForSelection).ToArray();
if (validBeatmaps.Any())
{
@@ -614,12 +616,9 @@ namespace osu.Game.Screens.SelectV2
return validSelection;
}
private bool checkBeatmapValidForSelection(BeatmapInfo beatmap, FilterCriteria? criteria)
private bool checkBeatmapValidForSelection(BeatmapInfo beatmap)
{
if (criteria == null)
return false;
if (!beatmap.AllowGameplayWithRuleset(Ruleset.Value, criteria.AllowConvertedBeatmaps))
if (!beatmap.AllowGameplayWithRuleset(Ruleset.Value, showConvertedBeatmaps.Value))
return false;
if (beatmap.Hidden)
@@ -777,7 +776,7 @@ namespace osu.Game.Screens.SelectV2
// This avoids a flicker of a placeholder or invalid beatmap before a proper selection.
//
// After the carousel finishes filtering, it will attempt a selection then call this method again.
if (!CarouselItemsPresented && !checkBeatmapValidForSelection(Beatmap.Value.BeatmapInfo, filterControl.CreateCriteria()))
if (!CarouselItemsPresented && !checkBeatmapValidForSelection(Beatmap.Value.BeatmapInfo))
return;
if (carousel.VisuallyFocusSelected)
@@ -834,7 +833,7 @@ namespace osu.Game.Screens.SelectV2
bool isFirstFilter = filterDebounce == null;
// Criteria change may have included a ruleset change which made the current selection invalid.
bool isSelectionValid = checkBeatmapValidForSelection(Beatmap.Value.BeatmapInfo, criteria);
bool isSelectionValid = checkBeatmapValidForSelection(Beatmap.Value.BeatmapInfo);
filterDebounce = Scheduler.AddDelayed(() => carousel.Filter(criteria, !isSelectionValid), isFirstFilter || !isSelectionValid ? 0 : filter_delay);
}