Move setting back to timing panel

ppy · Nov 11, 2024 · c37e487 · c37e487
1 parent 0cddb93
commit c37e487
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
@@ -422,10 +422,6 @@ private void load(OsuConfigManager config)
                                         Items = new MenuItem[]
                                         {
                                             new EditorMenuItem(EditorStrings.SetPreviewPointToCurrent, MenuItemType.Standard, SetPreviewPointToCurrentTime),
-                                            new ToggleMenuItem(EditorStrings.AdjustExistingObjectsOnTimingChanges)
-                                            {
-                                                State = { BindTarget = config.GetBindable<bool>(OsuSetting.EditorAdjustExistingObjectsOnTimingChanges) },
-                                            }
                                         }
                                     }
                                 }

diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -8,6 +8,7 @@
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Localisation;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -25,6 +26,12 @@ private void load()
         {
             Flow.AddRange(new Drawable[]
             {
+                new LabelledSwitchButton
+                {
+                    Label = EditorStrings.AdjustExistingObjectsOnTimingChanges,
+                    FixedLabelWidth = 220,
+                    Current = configManager.GetBindable<bool>(OsuSetting.EditorAdjustExistingObjectsOnTimingChanges),
+                },
                 new TapTimingControl(),
                 bpmTextEntry = new BPMTextBox(),
                 timeSignature = new LabelledTimeSignature