Merge pull request #30114 from bdach/form-slider-bar-transfer-value-o…

…n-commit Fix difficulty settings sliders attempting to reprocess all hitobjects on every instantaneous change
ppy · Oct 7, 2024 · af43b36 · af43b36
2 parents b977a18 + 1854e1c
commit af43b36
Show file tree

Hide file tree

Showing 10 changed files with 141 additions and 47 deletions.
diff --git a/osu.Android.props b/osu.Android.props
@@ -10,7 +10,7 @@
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.1006.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2024.1007.0" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Fody does not handle Android build well, and warns when unchanged.

diff --git a/osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs b/osu.Game.Rulesets.Mania/Edit/Setup/ManiaDifficultySection.cs
@@ -48,6 +48,7 @@ private void load()
                         MaxValue = 10,
                         Precision = 1,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 specialStyle = new FormCheckBox
@@ -67,6 +68,7 @@ private void load()
                         MaxValue = 10,
                         Precision = 0.1f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 overallDifficultySlider = new FormSliderBar<float>
@@ -80,6 +82,7 @@ private void load()
                         MaxValue = 10,
                         Precision = 0.1f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 baseVelocitySlider = new FormSliderBar<double>
@@ -93,6 +96,7 @@ private void load()
                         MaxValue = 3.6,
                         Precision = 0.01f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 tickRateSlider = new FormSliderBar<double>
@@ -106,6 +110,7 @@ private void load()
                         MaxValue = 4,
                         Precision = 1,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
             };

diff --git a/osu.Game.Rulesets.Osu/Edit/Setup/OsuDifficultySection.cs b/osu.Game.Rulesets.Osu/Edit/Setup/OsuDifficultySection.cs
@@ -42,6 +42,7 @@ private void load()
                         MaxValue = 10,
                         Precision = 0.1f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 healthDrainSlider = new FormSliderBar<float>
@@ -55,6 +56,7 @@ private void load()
                         MaxValue = 10,
                         Precision = 0.1f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 approachRateSlider = new FormSliderBar<float>
@@ -68,6 +70,7 @@ private void load()
                         MaxValue = 10,
                         Precision = 0.1f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 overallDifficultySlider = new FormSliderBar<float>
@@ -81,6 +84,7 @@ private void load()
                         MaxValue = 10,
                         Precision = 0.1f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 baseVelocitySlider = new FormSliderBar<double>
@@ -94,6 +98,7 @@ private void load()
                         MaxValue = 3.6,
                         Precision = 0.01f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 tickRateSlider = new FormSliderBar<double>
@@ -107,6 +112,7 @@ private void load()
                         MaxValue = 4,
                         Precision = 1,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 stackLeniency = new FormSliderBar<float>
@@ -120,6 +126,7 @@ private void load()
                         MaxValue = 1,
                         Precision = 0.1f
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
             };

diff --git a/osu.Game.Rulesets.Taiko/Edit/Setup/TaikoDifficultySection.cs b/osu.Game.Rulesets.Taiko/Edit/Setup/TaikoDifficultySection.cs
@@ -39,6 +39,7 @@ private void load()
                         MaxValue = 10,
                         Precision = 0.1f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 overallDifficultySlider = new FormSliderBar<float>
@@ -52,6 +53,7 @@ private void load()
                         MaxValue = 10,
                         Precision = 0.1f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 baseVelocitySlider = new FormSliderBar<double>
@@ -65,6 +67,7 @@ private void load()
                         MaxValue = 3.6,
                         Precision = 0.01f,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
                 tickRateSlider = new FormSliderBar<double>
@@ -78,6 +81,7 @@ private void load()
                         MaxValue = 4,
                         Precision = 1,
                     },
+                    TransferValueOnCommit = true,
                     TabbableContentContainer = this,
                 },
             };

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFormControls.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFormControls.cs
@@ -72,7 +72,7 @@ public TestSceneFormControls()
                         },
                         new FormSliderBar<float>
                         {
-                            Caption = "Instantaneous slider",
+                            Caption = "Slider",
                             Current = new BindableFloat
                             {
                                 MinValue = 0,
@@ -82,19 +82,6 @@ public TestSceneFormControls()
                             },
                             TabbableContentContainer = this,
                         },
-                        new FormSliderBar<float>
-                        {
-                            Caption = "Non-instantaneous slider",
-                            Current = new BindableFloat
-                            {
-                                MinValue = 0,
-                                MaxValue = 10,
-                                Value = 5,
-                                Precision = 0.1f,
-                            },
-                            Instantaneous = false,
-                            TabbableContentContainer = this,
-                        },
                         new FormEnumDropdown<CountdownType>
                         {
                             Caption = EditorSetupStrings.EnableCountdown,

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneFormSliderBar.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneFormSliderBar.cs
@@ -0,0 +1,63 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterfaceV2;
+using osu.Game.Overlays;
+using osuTK;
+
+namespace osu.Game.Tests.Visual.UserInterface
+{
+    public partial class TestSceneFormSliderBar : OsuTestScene
+    {
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
+
+        [Test]
+        public void TestTransferValueOnCommit()
+        {
+            OsuSpriteText text;
+            FormSliderBar<float> slider = null!;
+
+            AddStep("create content", () =>
+            {
+                Child = new FillFlowContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Width = 0.5f,
+                    Direction = FillDirection.Vertical,
+                    Spacing = new Vector2(10),
+                    Children = new Drawable[]
+                    {
+                        text = new OsuSpriteText(),
+                        slider = new FormSliderBar<float>
+                        {
+                            Caption = "Slider",
+                            Current = new BindableFloat
+                            {
+                                MinValue = 0,
+                                MaxValue = 10,
+                                Precision = 0.1f,
+                                Default = 5f,
+                            }
+                        },
+                    }
+                };
+                slider.Current.BindValueChanged(_ => text.Text = $"Current value is: {slider.Current.Value}", true);
+            });
+            AddToggleStep("toggle transfer value on commit", b =>
+            {
+                if (slider.IsNotNull())
+                    slider.TransferValueOnCommit = b;
+            });
+        }
+    }
+}