From 5541ebc76b438d0caa56060a73b9e3078b743258 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 10 Jun 2022 15:02:26 +0900 Subject: [PATCH] Revert `OsuButton` changes --- osu.Game/Graphics/UserInterface/OsuButton.cs | 2 +- osu.Game/Screens/Utility/ButtonWithKeyBind.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs index 044df13152..08514d94c3 100644 --- a/osu.Game/Graphics/UserInterface/OsuButton.cs +++ b/osu.Game/Graphics/UserInterface/OsuButton.cs @@ -20,7 +20,7 @@ namespace osu.Game.Graphics.UserInterface /// public class OsuButton : Button { - public virtual LocalisableString Text + public LocalisableString Text { get => SpriteText?.Text ?? default; set diff --git a/osu.Game/Screens/Utility/ButtonWithKeyBind.cs b/osu.Game/Screens/Utility/ButtonWithKeyBind.cs index 20e39ffa6a..ef87e0bca7 100644 --- a/osu.Game/Screens/Utility/ButtonWithKeyBind.cs +++ b/osu.Game/Screens/Utility/ButtonWithKeyBind.cs @@ -21,7 +21,7 @@ namespace osu.Game.Screens.Utility this.key = key; } - public override LocalisableString Text + public new LocalisableString Text { get => base.Text; set => base.Text = $"{value} (Press {key.ToString().Replace("Number", string.Empty)})";