1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-17 14:53:19 +08:00

Revert no longer necessary change

Additionally to fix the options button, I could either cache the
interface in PlaylistsSongSelectV2 or make the interface cache itself. I
went with the latter option.
This commit is contained in:
Dan Balasescu
2026-01-05 14:10:23 +09:00
Unverified
parent 0a2fc12061
commit ebf9c19ad3
4 changed files with 6 additions and 9 deletions
@@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
{
new FooterButtonMods(modOverlay) { Current = SelectedMods },
new FooterButtonRandom(),
new FooterButtonOptions(null),
new FooterButtonOptions(),
});
});
@@ -24,12 +24,8 @@ namespace osu.Game.Screens.SelectV2
[Resolved]
private IBindable<WorkingBeatmap> workingBeatmap { get; set; } = null!;
private readonly ISongSelect? songSelect;
public FooterButtonOptions(ISongSelect? songSelect)
{
this.songSelect = songSelect;
}
[Resolved]
private ISongSelect? songSelect { get; set; }
[Resolved]
private RealmAccess realm { get; set; } = null!;
+2
View File
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Beatmaps;
using osu.Game.Graphics.UserInterface;
@@ -12,6 +13,7 @@ namespace osu.Game.Screens.SelectV2
/// <summary>
/// Actions exposed by song select which are used by subcomponents to perform top-level operations.
/// </summary>
[Cached]
public interface ISongSelect
{
/// <summary>
+1 -2
View File
@@ -63,7 +63,6 @@ namespace osu.Game.Screens.SelectV2
/// This screen is intended to house all components introduced in the new song select design to add transitions and examine the overall look.
/// This will be gradually built upon and ultimately replace <see cref="Select.SongSelect"/> once everything is in place.
/// </summary>
[Cached(typeof(ISongSelect))]
public abstract partial class SongSelect : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>, ISongSelect, IHandlePresentBeatmap
{
/// <summary>
@@ -352,7 +351,7 @@ namespace osu.Game.Screens.SelectV2
errorSample?.Play();
}
},
new FooterButtonOptions(this)
new FooterButtonOptions
{
Hotkey = GlobalAction.ToggleBeatmapOptions,
}