Skip to content

Use input blocking container for mod display bar #34090

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Use input blocking container for mod display bar #34090

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdfa9b8
Use input blocking container for mod display bar
GSculerlor Jul 10, 2025
309c46f
Override on mouse down on unranked badge for consistency
GSculerlor Jul 10, 2025
ca0f4b0
Split mod display bar to separate composite drawable
GSculerlor Jul 11, 2025
0fc945d
Override hover on unranked badge
GSculerlor Jul 16, 2025
9a03360
Fix mods multiplier not displayed when transitioning back from other …
GSculerlor Jul 16, 2025
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
241 changes: 140 additions & 101 deletions osu.Game/Screens/SelectV2/FooterButtonMods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,13 @@ public Bindable<IReadOnlyList<Mod>> Current
set => current.Current = value;
}

private Container modDisplayBar = null!;
private Drawable modDisplayBar = null!;

private Drawable unrankedBadge = null!;

private ModDisplay modDisplay = null!;

private OsuSpriteText multiplierText { get; set; } = null!;

private Container modContainer = null!;

private ModCountText overflowModCountDisplay = null!;

[Resolved]
private OsuColour colours { get; set; } = null!;

[Resolved]
private OverlayColourProvider colourProvider { get; set; } = null!;

public FooterButtonMods(ModSelectOverlay overlay)
: base(overlay)
{
Expand All @@ -80,73 +69,7 @@ private void load()
AddRange(new[]
{
unrankedBadge = new UnrankedBadge(),
modDisplayBar = new Container
{
Y = -5f,
Depth = float.MaxValue,
Origin = Anchor.BottomLeft,
Shear = OsuGame.SHEAR,
CornerRadius = CORNER_RADIUS,
Size = new Vector2(BUTTON_WIDTH, bar_height),
Masking = true,
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Radius = 4,
// Figma says 50% opacity, but it does not match up visually if taken at face value, and looks bad.
Colour = Colour4.Black.Opacity(0.25f),
Offset = new Vector2(0, 2),
},
Children = new Drawable[]
{
new Box
{
Colour = colourProvider.Background4,
RelativeSizeAxes = Axes.Both,
},
new Container
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
RelativeSizeAxes = Axes.Both,
Width = 1f - mod_display_portion,
Masking = true,
Child = multiplierText = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Shear = -OsuGame.SHEAR,
UseFullGlyphHeight = false,
Font = OsuFont.Torus.With(size: 14f, weight: FontWeight.Bold)
}
},
modContainer = new Container
{
CornerRadius = CORNER_RADIUS,
RelativeSizeAxes = Axes.Both,
Width = mod_display_portion,
Masking = true,
Children = new Drawable[]
{
new Box
{
Colour = colourProvider.Background3,
RelativeSizeAxes = Axes.Both,
},
modDisplay = new ModDisplay(showExtendedInformation: true)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Shear = -OsuGame.SHEAR,
Scale = new Vector2(0.5f),
Current = { BindTarget = Current },
ExpansionMode = ExpansionMode.AlwaysContracted,
},
overflowModCountDisplay = new ModCountText { Mods = { BindTarget = Current }, },
}
},
}
},
modDisplayBar = new ModDisplayBar { Mods = { BindTarget = Current } },
});
}

Expand Down Expand Up @@ -193,9 +116,6 @@ private void updateDisplay()
{
modDisplayBar.MoveToY(20, duration, easing);
modDisplayBar.FadeOut(duration, easing);
modDisplay.FadeOut(duration, easing);
overflowModCountDisplay.FadeOut(duration, easing);

unrankedBadge.MoveToY(20, duration, easing);
unrankedBadge.FadeOut(duration, easing);

Expand All @@ -222,31 +142,146 @@ private void updateDisplay()
modDisplayBar.MoveToY(-5, duration, Easing.OutQuint);
unrankedBadge.MoveToY(-5, duration, easing);
modDisplayBar.FadeIn(duration, easing);
modDisplay.FadeIn(duration, easing);
}

double multiplier = Current.Value?.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier) ?? 1;
multiplierText.Text = ModUtils.FormatScoreMultiplier(multiplier);

if (multiplier > 1)
multiplierText.FadeColour(colours.Red1, duration, easing);
else if (multiplier < 1)
multiplierText.FadeColour(colours.Lime1, duration, easing);
else
multiplierText.FadeColour(Color4.White, duration, easing);
}

protected override void Update()
internal partial class ModDisplayBar : CompositeDrawable
{
base.Update();
private ModDisplay modDisplay = null!;

if (Current.Value.Count == 0)
return;
private OsuSpriteText multiplierText = null!;

if (modDisplay.DrawWidth * modDisplay.Scale.X > modContainer.DrawWidth)
overflowModCountDisplay.Show();
else
overflowModCountDisplay.Hide();
private ModCountText overflowModCountDisplay = null!;

private Container modContainer = null!;

public readonly Bindable<IReadOnlyList<Mod>> Mods = new Bindable<IReadOnlyList<Mod>>();

[Resolved]
private OverlayColourProvider colourProvider { get; set; } = null!;

[Resolved]
private OsuColour colours { get; set; } = null!;

public ModDisplayBar()
{
Y = -5f;
Depth = float.MaxValue;
Origin = Anchor.BottomLeft;
Shear = OsuGame.SHEAR;
CornerRadius = CORNER_RADIUS;
Size = new Vector2(BUTTON_WIDTH, bar_height);
Masking = true;
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Radius = 4,
// Figma says 50% opacity, but it does not match up visually if taken at face value, and looks bad.
Colour = Colour4.Black.Opacity(0.25f),
Offset = new Vector2(0, 2),
};
}

[BackgroundDependencyLoader]
private void load()
{
InternalChildren = new Drawable[]
{
new Box
{
Colour = colourProvider.Background4,
RelativeSizeAxes = Axes.Both,
},
new Container
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight,
RelativeSizeAxes = Axes.Both,
Width = 1f - mod_display_portion,
Masking = true,
Child = multiplierText = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Shear = -OsuGame.SHEAR,
UseFullGlyphHeight = false,
Font = OsuFont.Torus.With(size: 14f, weight: FontWeight.Bold)
}
},
modContainer = new Container
{
CornerRadius = CORNER_RADIUS,
RelativeSizeAxes = Axes.Both,
Width = mod_display_portion,
Masking = true,
Children = new Drawable[]
{
new Box
{
Colour = colourProvider.Background3,
RelativeSizeAxes = Axes.Both,
},
modDisplay = new ModDisplay(showExtendedInformation: true)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Shear = -OsuGame.SHEAR,
Scale = new Vector2(0.5f),
Current = { BindTarget = Mods },
ExpansionMode = ExpansionMode.AlwaysContracted,
},
overflowModCountDisplay = new ModCountText { Mods = { BindTarget = Mods }, },
}
},
};
}

protected override void LoadComplete()
{
base.LoadComplete();

Mods.BindValueChanged(_ => updateDisplay(), true);
Copy link
Member

@Joehuu Joehuu Jul 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs the ModSettingChangeTracker, else the multiplier won't update:

Screen.Recording.2025-07-16.at.10.20.16.AM.mov

Hopefully you can just move the one from the parent to this component class and not duplicating or passing, haven't tried. The unranked badge will probably not update.

}

protected override void Update()
{
base.Update();

if (Mods.Value.Count == 0)
return;

if (modDisplay.DrawWidth * modDisplay.Scale.X > modContainer.DrawWidth)
overflowModCountDisplay.Show();
else
overflowModCountDisplay.Hide();
}

private void updateDisplay()
{
if (Mods.Value.Count == 0)
{
modDisplay.FadeOut(duration, easing);
overflowModCountDisplay.FadeOut(duration, easing);
}
else
{
modDisplay.FadeIn(duration, easing);
}

double multiplier = Mods.Value?.Aggregate(1.0, (current, mod) => current * mod.ScoreMultiplier) ?? 1;
multiplierText.Text = ModUtils.FormatScoreMultiplier(multiplier);

if (multiplier > 1)
multiplierText.FadeColour(colours.Red1, duration, easing);
else if (multiplier < 1)
multiplierText.FadeColour(colours.Lime1, duration, easing);
else
multiplierText.FadeColour(Color4.White, duration, easing);
}

protected override bool OnMouseDown(MouseDownEvent e) => true;

protected override bool OnHover(HoverEvent e) => true;
}

private partial class ModCountText : CompositeDrawable, IHasCustomTooltip<IReadOnlyList<Mod>>
Expand Down Expand Up @@ -378,6 +413,10 @@ private void load(OsuColour colours)
}
};
}

protected override bool OnMouseDown(MouseDownEvent e) => true;

protected override bool OnHover(HoverEvent e) => true;
}
}
}
Loading