Switch back to last tool after using grid tool, rather than always se…

…lect tool
OliBomby · Oct 8, 2024 · b1be31c · b1be31c
1 parent 682023e
commit b1be31c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/GridPlacementBlueprint.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/GridPlacementBlueprint.cs
@@ -42,7 +42,7 @@ public override void EndPlacement(bool commit)
 
             // You typically only place the grid once, so we switch back to the select tool after placement.
             if (commit && hitObjectComposer is OsuHitObjectComposer osuHitObjectComposer)
-                osuHitObjectComposer.SetSelectTool();
+                osuHitObjectComposer.SetLastTool();
         }
 
         protected override bool OnClick(ClickEvent e)

diff --git a/osu.Game/Rulesets/Edit/HitObjectComposer.cs b/osu.Game/Rulesets/Edit/HitObjectComposer.cs
@@ -90,6 +90,9 @@ public abstract partial class HitObjectComposer<TObject> : HitObjectComposer, IP
         private Bindable<bool> autoSeekOnPlacement;
         private readonly Bindable<bool> composerFocusMode = new Bindable<bool>();
 
+        [CanBeNull]
+        private RadioButton lastTool;
+
         protected DrawableRuleset<TObject> DrawableRuleset { get; private set; }
 
         protected HitObjectComposer(Ruleset ruleset)
@@ -213,8 +216,7 @@ private void load(OsuConfigManager config, [CanBeNull] Editor editor)
                 },
             };
 
-            toolboxCollection.Items = CompositionTools
-                                      .Prepend(new SelectTool())
+            toolboxCollection.Items = (CompositionTools.Prepend(new SelectTool()))
                                       .Select(t => new HitObjectCompositionToolButton(t, () => toolSelected(t)))
                                       .ToList();
 
@@ -466,8 +468,12 @@ private void selectionChanged(object sender, NotifyCollectionChangedEventArgs ch
 
         public void SetSelectTool() => toolboxCollection.Items.First().Select();
 
+        public void SetLastTool() => (lastTool ?? toolboxCollection.Items.First()).Select();
+
         private void toolSelected(CompositionTool tool)
         {
+            lastTool = toolboxCollection.Items.OfType<HitObjectCompositionToolButton>().FirstOrDefault(i => i.Tool == BlueprintContainer.CurrentTool);
+
             BlueprintContainer.CurrentTool = tool;
 
             if (!(tool is SelectTool))