h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 11:47:24 +08:00
Code Issues Releases Wiki Activity

Move setting back to timing panel

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-11-11 10:08:26 +01:00
parent 0cddb93dda
commit c37e4877e2
No known key found for this signature in database
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Edit/Editor.cs
View File

@ -422,10 +422,6 @@ namespace osu.Game.Screens.Edit
Items = new MenuItem[] Items = new MenuItem[]
{ {
new EditorMenuItem(EditorStrings.SetPreviewPointToCurrent, MenuItemType.Standard, SetPreviewPointToCurrentTime), new EditorMenuItem(EditorStrings.SetPreviewPointToCurrent, MenuItemType.Standard, SetPreviewPointToCurrentTime),
new ToggleMenuItem(EditorStrings.AdjustExistingObjectsOnTimingChanges)
{
State = { BindTarget = config.GetBindable<bool>(OsuSetting.EditorAdjustExistingObjectsOnTimingChanges) },
}
} }
} }
} }

7
osu.Game/Screens/Edit/Timing/TimingSection.cs
View File

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