Skip to content

Allow clicking anywhere on the scoped beatmap set indicator to dismiss it #36176

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.

Sign up for GitHub

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

Merged
peppy merged 1 commit into from
Dec 30, 2025
Merged

Allow clicking anywhere on the scoped beatmap set indicator to dismiss it #36176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 33 additions & 14 deletions osu.Game/Screens/SelectV2/FilterControl.ScopedBeatmapSetDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace osu.Game.Screens.SelectV2
{
public partial class FilterControl
{
public partial class ScopedBeatmapSetDisplay : CompositeDrawable, IKeyBindingHandler<GlobalAction>
public partial class ScopedBeatmapSetDisplay : OsuClickableContainer, IKeyBindingHandler<GlobalAction>
{
public Bindable<BeatmapSetInfo?> ScopedBeatmapSet
{
Expand All @@ -29,20 +29,27 @@ public Bindable<BeatmapSetInfo?> ScopedBeatmapSet
}

private readonly BindableWithCurrent<BeatmapSetInfo?> scopedBeatmapSet = new BindableWithCurrent<BeatmapSetInfo?>();
private Box flashLayer = null!;
private Container content = null!;
private OsuTextFlowContainer text = null!;
private ShearedButton goBackButton = null!;

[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
private const float transition_duration = 300;

public ScopedBeatmapSetDisplay()
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
AutoSizeEasing = Easing.OutQuint;
AutoSizeDuration = 200;
CornerRadius = 8f;
Masking = true;
InternalChildren = new Drawable[]
}

[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
Content.AutoSizeEasing = Easing.OutQuint;
Content.AutoSizeDuration = transition_duration;

AddRange(new Drawable[]
{
new Box
{
Expand Down Expand Up @@ -71,18 +78,26 @@ private void load(OverlayColourProvider colourProvider)
Colour = colourProvider.Background6,
Padding = new MarginPadding { Right = 80, Vertical = 5 }
},
goBackButton = new ShearedButton(80)
new ShearedButton(80)
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
Text = CommonStrings.Back,
RelativeSizeAxes = Axes.Y,
Height = 1,
Action = () => scopedBeatmapSet.Value = null,
Action = () => Action?.Invoke(),
}
}
}
};
},
flashLayer = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Colour4.White,
Blending = BlendingParameters.Additive,
Alpha = 0,
},
});
Action = () => scopedBeatmapSet.Value = null;
}

protected override void LoadComplete()
Expand All @@ -94,22 +109,26 @@ protected override void LoadComplete()

private void updateState()
{
content.BypassAutoSizeAxes = scopedBeatmapSet.Value != null ? Axes.None : Axes.Y;

if (scopedBeatmapSet.Value != null)
{
content.BypassAutoSizeAxes = Axes.None;
text.Clear();
text.AddText(SongSelectStrings.TemporarilyShowingAllBeatmapsIn);
text.AddText(@" ");
text.AddText(scopedBeatmapSet.Value.Metadata.GetDisplayTitleRomanisable(), t => t.Font = OsuFont.Style.Body.With(weight: FontWeight.Bold));
}
else
{
flashLayer.FadeOutFromOne(transition_duration, Easing.OutQuint);
content.BypassAutoSizeAxes = Axes.Y;
}
}

public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
{
if (scopedBeatmapSet.Value != null && e.Action == GlobalAction.Back && !e.Repeat)
{
goBackButton.TriggerClick();
TriggerClick();
return true;
}

Expand Down
Loading