Hide scroll speed changes in std and ctb editor

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -254,5 +254,7 @@ public override BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDiffi
 
             return adjustedDifficulty;
         }
+
+        public override bool EditorShowScrollSpeed => false;
     }
 }

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -359,5 +359,7 @@ public override BeatmapDifficulty GetRateAdjustedDisplayDifficulty(IBeatmapDiffi
 
             return adjustedDifficulty;
         }
+
+        public override bool EditorShowScrollSpeed => false;
     }
 }

osu.Game/Rulesets/Ruleset.cs

@@ -401,5 +401,10 @@ public virtual IEnumerable<SetupSection> CreateEditorSetupSections() =>
             new DifficultySection(),
             new ColoursSection(),
         ];
+
+        /// <summary>
+        /// Can be overridden to avoid showing scroll speed changes in the editor.
+        /// </summary>
+        public virtual bool EditorShowScrollSpeed => true;
     }
 }

osu.Game/Rulesets/UI/Scrolling/DrawableScrollingRuleset.cs

@@ -64,8 +64,6 @@ public abstract partial class DrawableScrollingRuleset<TObject> : DrawableRulese
             MaxValue = time_span_max
         };
 
-        ScrollVisualisationMethod IDrawableScrollingRuleset.VisualisationMethod => VisualisationMethod;
-
         /// <summary>
         /// Whether the player can change <see cref="TimeRange"/>.
         /// </summary>

osu.Game/Rulesets/UI/Scrolling/IDrawableScrollingRuleset.cs

@@ -1,17 +1,13 @@
 // 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 osu.Game.Configuration;
-
 namespace osu.Game.Rulesets.UI.Scrolling
 {
     /// <summary>
     /// An interface for scrolling-based <see cref="DrawableRuleset{TObject}"/>s.
     /// </summary>
     public interface IDrawableScrollingRuleset
     {
-        ScrollVisualisationMethod VisualisationMethod { get; }
-
         IScrollingInfo ScrollingInfo { get; }
     }
 }

osu.Game/Screens/Edit/Components/Timelines/Summary/Parts/EffectPointVisualisation.cs

@@ -79,7 +79,14 @@ private void refreshDisplay()
         {
             ClearInternal();
 
-            AddInternal(new ControlPointVisualisation(effect));
+            if (beatmap.BeatmapInfo.Ruleset.CreateInstance().EditorShowScrollSpeed)
+            {
+                AddInternal(new ControlPointVisualisation(effect)
+                {
+                    // importantly, override the x position being set since we do that in the GroupVisualisation parent drawable.
+                    X = 0,
+                });
+            }
 
             if (!kiai.Value)
                 return;

osu.Game/Screens/Edit/Timing/EffectSection.cs

@@ -5,9 +5,7 @@
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Configuration;
 using osu.Game.Graphics.UserInterfaceV2;
-using osu.Game.Rulesets.UI.Scrolling;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -38,8 +36,7 @@ protected override void LoadComplete()
             kiai.Current.BindValueChanged(_ => saveChanges());
             scrollSpeedSlider.Current.BindValueChanged(_ => saveChanges());
 
-            var drawableRuleset = Beatmap.BeatmapInfo.Ruleset.CreateInstance().CreateDrawableRulesetWith(Beatmap.PlayableBeatmap);
-            if (drawableRuleset is not IDrawableScrollingRuleset scrollingRuleset || scrollingRuleset.VisualisationMethod == ScrollVisualisationMethod.Constant)
+            if (!Beatmap.BeatmapInfo.Ruleset.CreateInstance().EditorShowScrollSpeed)
                 scrollSpeedSlider.Hide();
 
             void saveChanges()

osu.Game/Screens/Edit/Timing/RowAttributes/EffectRowAttribute.cs

@@ -15,6 +15,10 @@ public partial class EffectRowAttribute : RowAttribute
 
         private AttributeText kiaiModeBubble = null!;
         private AttributeText text = null!;
+        private AttributeProgressBar progressBar = null!;
+
+        [Resolved]
+        protected EditorBeatmap Beatmap { get; private set; } = null!;
 
         public EffectRowAttribute(EffectControlPoint effect)
             : base(effect, "effect")
@@ -28,14 +32,20 @@ private void load()
         {
             Content.AddRange(new Drawable[]
             {
-                new AttributeProgressBar(Point)
+                progressBar = new AttributeProgressBar(Point)
                 {
                     Current = scrollSpeed,
                 },
                 text = new AttributeText(Point) { Width = 45 },
                 kiaiModeBubble = new AttributeText(Point) { Text = "kiai" },
             });
 
+            if (!Beatmap.BeatmapInfo.Ruleset.CreateInstance().EditorShowScrollSpeed)
+            {
+                text.Hide();
+                progressBar.Hide();
+            }
+
             kiaiMode.BindValueChanged(enabled => kiaiModeBubble.FadeTo(enabled.NewValue ? 1 : 0), true);
             scrollSpeed.BindValueChanged(_ => updateText(), true);
         }