From 148afd120127c58655ed35190fb7456ce1f0e973 Mon Sep 17 00:00:00 2001
From: Fabian van Oeffelt <fabiano2002@gmx.de>
Date: Tue, 21 May 2024 14:47:34 +0200
Subject: [PATCH] Change Speedchange behaviour to keep changing while holding
 key, Add Toast to nofity user what just happend

---
 osu.Game/Localisation/ToastStrings.cs     |  5 +++++
 osu.Game/Overlays/OSD/SpeedChangeToast.cs | 17 +++++++++++++++
 osu.Game/Screens/Select/SongSelect.cs     | 26 ++++++++++++++++-------
 3 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 osu.Game/Overlays/OSD/SpeedChangeToast.cs

diff --git a/osu.Game/Localisation/ToastStrings.cs b/osu.Game/Localisation/ToastStrings.cs
index da798a393784..33027966dd8b 100644
--- a/osu.Game/Localisation/ToastStrings.cs
+++ b/osu.Game/Localisation/ToastStrings.cs
@@ -49,6 +49,11 @@ public static class ToastStrings
         /// </summary>
         public static LocalisableString UrlCopied => new TranslatableString(getKey(@"url_copied"), @"URL copied");
 
+        /// <summary>
+        /// "Speed Changed"
+        /// </summary>
+        public static LocalisableString SpeedChanged => new TranslatableString(getKey(@"speed_changed"), @"Speed Changed");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Overlays/OSD/SpeedChangeToast.cs b/osu.Game/Overlays/OSD/SpeedChangeToast.cs
new file mode 100644
index 000000000000..73ba23622b96
--- /dev/null
+++ b/osu.Game/Overlays/OSD/SpeedChangeToast.cs
@@ -0,0 +1,17 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Game.Configuration;
+using osu.Game.Input.Bindings;
+using osu.Game.Localisation;
+
+namespace osu.Game.Overlays.OSD
+{
+    public partial class SpeedChangeToast : Toast
+    {
+        public SpeedChangeToast(OsuConfigManager config, double delta)
+            : base(CommonStrings.Beatmaps, ToastStrings.SpeedChanged, config.LookupKeyBindings(GlobalAction.IncreaseSpeed) + " / " + config.LookupKeyBindings(GlobalAction.DecreaseSpeed))
+        {
+        }
+    }
+}
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index e1447b284ad4..7eb2be9100ed 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -30,6 +30,7 @@
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Mods;
+using osu.Game.Overlays.OSD;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Backgrounds;
@@ -151,6 +152,12 @@ public abstract partial class SongSelect : ScreenWithBeatmapBackground, IKeyBind
 
         private bool usedPitchMods;
 
+        [Resolved]
+        private OnScreenDisplay? onScreenDisplay { get; set; }
+
+        [Resolved]
+        private OsuConfigManager? config { get; set; }
+
         [BackgroundDependencyLoader(true)]
         private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog? manageCollectionsDialog, DifficultyRecommender? recommender, OsuConfigManager config)
         {
@@ -819,7 +826,7 @@ public override bool OnBackButton()
         public void ChangeSpeed(double delta)
         {
             // Mod Change from 0.95 DC to 1.0 none to 1.05 DT/NC ?
-
+            onScreenDisplay?.Display(new SpeedChangeToast(config!, delta));
             if (game == null) return;
 
             ModNightcore modNc = (ModNightcore)((MultiMod)game.AvailableMods.Value[ModType.DifficultyIncrease].First(mod => mod is MultiMod multiMod && multiMod.Mods.Count(modType => modType is ModNightcore) > 0)).Mods.First(mod => mod is ModNightcore);
@@ -1135,17 +1142,10 @@ public void ClearScores(BeatmapInfo? beatmapInfo)
 
         public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
         {
-            if (e.Repeat)
-                return false;
-
             if (!this.IsCurrentScreen()) return false;
 
             switch (e.Action)
             {
-                case GlobalAction.Select:
-                    FinaliseSelection();
-                    return true;
-
                 case GlobalAction.IncreaseSpeed:
                     ChangeSpeed(0.05);
                     return true;
@@ -1155,6 +1155,16 @@ public virtual bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
                     return true;
             }
 
+            if (e.Repeat)
+                return false;
+
+            switch (e.Action)
+            {
+                case GlobalAction.Select:
+                    FinaliseSelection();
+                    return true;
+            }
+
             return false;
         }