From a6545bea684b40addb800cc3aec6d7c77934816b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Wed, 31 Dec 2025 10:05:59 +0100 Subject: [PATCH] Remove dim effect from disabled spread displays on song select panels --- osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs | 6 +++--- osu.Game/Screens/SelectV2/PanelBeatmapSet.SpreadDisplay.cs | 2 ++ .../SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs index 9eda065495..f77d00e6e7 100644 --- a/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs +++ b/osu.Game/Graphics/UserInterface/OsuAnimatedButton.cs @@ -92,12 +92,12 @@ namespace osu.Game.Graphics.UserInterface { base.LoadComplete(); - Colour = dimColour; - Enabled.BindValueChanged(_ => this.FadeColour(dimColour, 200, Easing.OutQuint), true); + Colour = Enabled.Value ? Colour4.White : DimColour; + Enabled.BindValueChanged(_ => this.FadeColour(DimColour, 200, Easing.OutQuint), true); FinishTransforms(true); } - private Color4 dimColour => Enabled.Value ? Color4.White : colours.Gray9; + protected virtual Colour4 DimColour => colours.Gray9; protected override bool OnHover(HoverEvent e) { diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapSet.SpreadDisplay.cs b/osu.Game/Screens/SelectV2/PanelBeatmapSet.SpreadDisplay.cs index e7ecc9ceb7..4cbe4521bb 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapSet.SpreadDisplay.cs +++ b/osu.Game/Screens/SelectV2/PanelBeatmapSet.SpreadDisplay.cs @@ -31,6 +31,8 @@ namespace osu.Game.Screens.SelectV2 public BindableBool Expanded { get; } = new BindableBool(); + protected override Colour4 DimColour => Colour4.White; + private readonly Bindable scopedBeatmapSet = new Bindable(); private readonly Bindable showConvertedBeatmaps = new Bindable(); diff --git a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs b/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs index 32a48996a7..b3fa2fa01e 100644 --- a/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs +++ b/osu.Game/Screens/SelectV2/PanelBeatmapStandalone.SpreadDisplay.cs @@ -27,6 +27,8 @@ namespace osu.Game.Screens.SelectV2 public Bindable Beatmap { get; } = new Bindable(); public Bindable StarDifficulty { get; } = new Bindable(); + protected override Colour4 DimColour => Colour4.White; + private readonly Bindable scopedBeatmapSet = new Bindable(); private readonly Bindable showConvertedBeatmaps = new Bindable();