From 5e86a01e5e3e91404d5021572cd8170661d59618 Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Sun, 14 Jul 2024 20:59:46 +0200
Subject: [PATCH] allow hotkeys in sample point piece

---
 osu.Game/Rulesets/Edit/HitObjectComposer.cs   | 28 +++++++++++++------
 .../Components/Timeline/SamplePointPiece.cs   | 19 +++++++++----
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
index ac9c830f03..f2713739b9 100644
--- a/osu.Game/Rulesets/Edit/HitObjectComposer.cs
+++ b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -373,6 +373,8 @@ namespace osu.Game.Rulesets.Edit
             if (e.ControlPressed || e.SuperPressed)
                 return false;
 
+            bool handled = false;
+
             if (checkLeftToggleFromKey(e.Key, out int leftIndex))
             {
                 var item = toolboxCollection.Items.ElementAtOrDefault(leftIndex);
@@ -387,20 +389,30 @@ namespace osu.Game.Rulesets.Edit
 
             if (checkRightToggleFromKey(e.Key, out int rightIndex))
             {
-                var item = e.AltPressed
-                    ? sampleAdditionBankTogglesCollection.ElementAtOrDefault(rightIndex)
-                    : e.ShiftPressed
-                        ? sampleBankTogglesCollection.ElementAtOrDefault(rightIndex)
-                        : togglesCollection.ElementAtOrDefault(rightIndex);
+                if (e.ShiftPressed || e.AltPressed)
+                {
+                    if (e.ShiftPressed)
+                        attemptToggle(rightIndex, sampleBankTogglesCollection);
+
+                    if (e.AltPressed)
+                        attemptToggle(rightIndex, sampleAdditionBankTogglesCollection);
+                }
+                else
+                    attemptToggle(rightIndex, togglesCollection);
+            }
+
+            return handled || base.OnKeyDown(e);
+
+            void attemptToggle(int index, FillFlowContainer collection)
+            {
+                var item = collection.ElementAtOrDefault(index);
 
                 if (item is DrawableTernaryButton button)
                 {
                     button.Button.Toggle();
-                    return true;
+                    handled = true;
                 }
             }
-
-            return base.OnKeyDown(e);
         }
 
         private bool checkLeftToggleFromKey(Key key, out int index)
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index 8c7603021a..07c6cab7a1 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -381,20 +381,27 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             protected override bool OnKeyDown(KeyDownEvent e)
             {
-                if (e.ControlPressed || e.AltPressed || e.SuperPressed || !checkRightToggleFromKey(e.Key, out int rightIndex))
+                if (e.ControlPressed || e.SuperPressed || !checkRightToggleFromKey(e.Key, out int rightIndex))
                     return base.OnKeyDown(e);
 
-                if (e.ShiftPressed)
+                if (e.ShiftPressed || e.AltPressed)
                 {
                     string? newBank = banks.ElementAtOrDefault(rightIndex);
 
                     if (string.IsNullOrEmpty(newBank))
                         return true;
 
-                    setBank(newBank);
-                    updatePrimaryBankState();
-                    setAdditionBank(newBank);
-                    updateAdditionBankState();
+                    if (e.ShiftPressed)
+                    {
+                        setBank(newBank);
+                        updatePrimaryBankState();
+                    }
+
+                    if (e.AltPressed)
+                    {
+                        setAdditionBank(newBank);
+                        updateAdditionBankState();
+                    }
                 }
                 else
                 {