Add button to centre editor grid to current hit object

peppy · Oct 1, 2024 · 26186bd · 26186bd
1 parent 7d756d0
commit 26186bd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs b/osu.Game.Rulesets.Osu/Edit/OsuGridToolboxGroup.cs
@@ -14,6 +14,7 @@
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Input.Bindings;
 using osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Game.Screens.Edit;
 using osu.Game.Screens.Edit.Components.RadioButtons;
@@ -90,6 +91,8 @@ public partial class OsuGridToolboxGroup : EditorToolboxGroup, IKeyBindingHandle
         private ExpandableSlider<float> gridLinesRotationSlider = null!;
         private EditorRadioButtonCollection gridTypeButtons = null!;
 
+        private ExpandableButton useSelectedObjectPositionButton = null!;
+
         public OsuGridToolboxGroup()
             : base("grid")
         {
@@ -112,6 +115,18 @@ private void load()
                     Current = StartPositionY,
                     KeyboardStep = 1,
                 },
+                useSelectedObjectPositionButton = new ExpandableButton
+                {
+                    ExpandedLabelText = "Centre on selected object",
+                    Action = () =>
+                    {
+                        if (editorBeatmap.SelectedHitObjects.Count != 1)
+                            return;
+
+                        StartPosition.Value = ((IHasPosition)editorBeatmap.SelectedHitObjects.Single()).Position;
+                    },
+                    RelativeSizeAxes = Axes.X,
+                },
                 spacingSlider = new ExpandableSlider<float>
                 {
                     Current = Spacing,
@@ -213,6 +228,12 @@ protected override void LoadComplete()
             }, true);
         }
 
+        protected override void Update()
+        {
+            base.Update();
+            useSelectedObjectPositionButton.Enabled.Value = editorBeatmap.SelectedHitObjects.Count == 1 && StartPosition.Value != ((IHasPosition)editorBeatmap.SelectedHitObjects.Single()).Position;
+        }
+
         private void nextGridSize()
         {
             Spacing.Value = Spacing.Value * 2 >= max_automatic_spacing ? Spacing.Value / 8 : Spacing.Value * 2;

diff --git a/osu.Game/Rulesets/Edit/ExpandableButton.cs b/osu.Game/Rulesets/Edit/ExpandableButton.cs
@@ -11,7 +11,7 @@
 
 namespace osu.Game.Rulesets.Edit
 {
-    internal partial class ExpandableButton : RoundedButton, IExpandable
+    public partial class ExpandableButton : RoundedButton, IExpandable
     {
         private float actualHeight;