Merge pull request #10330 from peppy/editor-timing-screen-change-hand…

…ling Add change handler callbacks from timing screen / components
ppy · Oct 5, 2020 · 421e061 · 421e061
2 parents 39f1ceb + d3e1da5
commit 421e061
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 3 deletions.
diff --git a/osu.Game/Screens/Edit/EditorChangeHandler.cs b/osu.Game/Screens/Edit/EditorChangeHandler.cs
@@ -81,9 +81,6 @@ public void EndChange()
                 SaveState();
         }
 
-        /// <summary>
-        /// Saves the current <see cref="Editor"/> state.
-        /// </summary>
         public void SaveState()
         {
             if (bulkChangesStarted > 0)

diff --git a/osu.Game/Screens/Edit/IEditorChangeHandler.cs b/osu.Game/Screens/Edit/IEditorChangeHandler.cs
@@ -35,5 +35,11 @@ public interface IEditorChangeHandler
         /// This should be invoked as soon as possible after <see cref="BeginChange"/> to cause a state change.
         /// </remarks>
         void EndChange();
+
+        /// <summary>
+        /// Immediately saves the current <see cref="Editor"/> state.
+        /// Note that this will be a no-op if there is a change in progress via <see cref="BeginChange"/>.
+        /// </summary>
+        void SaveState();
     }
 }
diff --git a/osu.Game/Screens/Edit/Timing/DifficultySection.cs b/osu.Game/Screens/Edit/Timing/DifficultySection.cs
@@ -28,6 +28,7 @@ protected override void OnControlPointChanged(ValueChangedEvent<DifficultyContro
             if (point.NewValue != null)
             {
                 multiplierSlider.Current = point.NewValue.SpeedMultiplierBindable;
+                multiplierSlider.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 

diff --git a/osu.Game/Screens/Edit/Timing/EffectSection.cs b/osu.Game/Screens/Edit/Timing/EffectSection.cs
@@ -28,7 +28,10 @@ protected override void OnControlPointChanged(ValueChangedEvent<EffectControlPoi
             if (point.NewValue != null)
             {
                 kiai.Current = point.NewValue.KiaiModeBindable;
+                kiai.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
+
                 omitBarLine.Current = point.NewValue.OmitFirstBarLineBindable;
+                omitBarLine.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 

diff --git a/osu.Game/Screens/Edit/Timing/SampleSection.cs b/osu.Game/Screens/Edit/Timing/SampleSection.cs
@@ -35,7 +35,10 @@ protected override void OnControlPointChanged(ValueChangedEvent<SampleControlPoi
             if (point.NewValue != null)
             {
                 bank.Current = point.NewValue.SampleBankBindable;
+                bank.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
+
                 volume.Current = point.NewValue.SampleVolumeBindable;
+                volume.Current.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 

diff --git a/osu.Game/Screens/Edit/Timing/Section.cs b/osu.Game/Screens/Edit/Timing/Section.cs
@@ -32,6 +32,9 @@ internal abstract class Section<T> : CompositeDrawable
         [Resolved]
         protected Bindable<ControlPointGroup> SelectedGroup { get; private set; }
 
+        [Resolved(canBeNull: true)]
+        protected IEditorChangeHandler ChangeHandler { get; private set; }
+
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {

diff --git a/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs b/osu.Game/Screens/Edit/Timing/SliderWithTextBoxInput.cs
@@ -38,6 +38,7 @@ public SliderWithTextBoxInput(string labelText)
                         },
                         slider = new SettingsSlider<T>
                         {
+                            TransferValueOnCommit = true,
                             RelativeSizeAxes = Axes.X,
                         }
                     }

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -87,6 +87,9 @@ public class ControlPointList : CompositeDrawable
             [Resolved]
             private Bindable<ControlPointGroup> selectedGroup { get; set; }
 
+            [Resolved(canBeNull: true)]
+            private IEditorChangeHandler changeHandler { get; set; }
+
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
@@ -146,6 +149,7 @@ protected override void LoadComplete()
                 controlGroups.BindCollectionChanged((sender, args) =>
                 {
                     table.ControlGroups = controlGroups;
+                    changeHandler.SaveState();
                 }, true);
             }
 

diff --git a/osu.Game/Screens/Edit/Timing/TimingSection.cs b/osu.Game/Screens/Edit/Timing/TimingSection.cs
@@ -37,8 +37,13 @@ protected override void OnControlPointChanged(ValueChangedEvent<TimingControlPoi
             if (point.NewValue != null)
             {
                 bpmSlider.Bindable = point.NewValue.BeatLengthBindable;
+                bpmSlider.Bindable.BindValueChanged(_ => ChangeHandler?.SaveState());
+
                 bpmTextEntry.Bindable = point.NewValue.BeatLengthBindable;
+                // no need to hook change handler here as it's the same bindable as above
+
                 timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
+                timeSignature.Bindable.BindValueChanged(_ => ChangeHandler?.SaveState());
             }
         }
 
@@ -117,6 +122,8 @@ public BPMSlider()
                 bpmBindable.BindValueChanged(bpm => beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
 
                 base.Bindable = bpmBindable;
+
+                TransferValueOnCommit = true;
             }
 
             public override Bindable<double> Bindable