Remove expanding behaviour of timeline completely

ppy · Aug 21, 2024 · fef56cc · fef56cc
1 parent 7e64901
commit fef56cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 65 deletions.
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -16,7 +16,6 @@
 using osu.Game.Graphics;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Edit;
-using osu.Game.Screens.Edit.Components.Timelines.Summary.Visualisations;
 using osuTK;
 using osuTK.Input;
 
@@ -26,25 +25,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     public partial class Timeline : ZoomableScrollContainer, IPositionSnapProvider
     {
         private const float timeline_height = 80;
-        private const float timeline_expanded_height = 80;
 
         private readonly Drawable userContent;
 
-        private bool alwaysShowControlPoints;
-
-        public bool AlwaysShowControlPoints
-        {
-            get => alwaysShowControlPoints;
-            set
-            {
-                if (value == alwaysShowControlPoints)
-                    return;
-
-                alwaysShowControlPoints = value;
-                controlPointsVisible.TriggerChange();
-            }
-        }
-
         [Resolved]
         private EditorClock editorClock { get; set; } = null!;
 
@@ -80,12 +63,7 @@ public bool AlwaysShowControlPoints
 
         private TimelineTickDisplay ticks = null!;
 
-        private TimelineTimingChangeDisplay controlPoints = null!;
-
-        private Container mainContent = null!;
-
         private Bindable<float> waveformOpacity = null!;
-        private Bindable<bool> controlPointsVisible = null!;
         private Bindable<bool> ticksVisible = null!;
 
         private double trackLengthForZoom;
@@ -112,18 +90,16 @@ private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours, OverlayC
             // We don't want the centre marker to scroll
             AddInternal(centreMarker = new CentreMarker());
 
-            ticks = new TimelineTickDisplay();
-
             AddRange(new Drawable[]
             {
-                ticks,
-                controlPoints = new TimelineTimingChangeDisplay
+                ticks = new TimelineTickDisplay(),
+                new TimelineTimingChangeDisplay
                 {
                     RelativeSizeAxes = Axes.Both,
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft,
                 },
-                mainContent = new Container
+                new Container
                 {
                     RelativeSizeAxes = Axes.X,
                     Height = timeline_height,
@@ -153,7 +129,6 @@ private void load(IBindable<WorkingBeatmap> beatmap, OsuColour colours, OverlayC
             });
 
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
-            controlPointsVisible = config.GetBindable<bool>(OsuSetting.EditorTimelineShowTimingChanges);
             ticksVisible = config.GetBindable<bool>(OsuSetting.EditorTimelineShowTicks);
 
             track.BindTo(editorClock.Track);
@@ -187,26 +162,6 @@ protected override void LoadComplete()
             waveformOpacity.BindValueChanged(_ => updateWaveformOpacity(), true);
 
             ticksVisible.BindValueChanged(visible => ticks.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint), true);
-
-            controlPointsVisible.BindValueChanged(visible =>
-            {
-                if (visible.NewValue || alwaysShowControlPoints)
-                {
-                    this.ResizeHeightTo(timeline_expanded_height, 200, Easing.OutQuint);
-                    mainContent.MoveToY(0, 200, Easing.OutQuint);
-
-                    // delay the fade in else masking looks weird.
-                    controlPoints.Delay(180).FadeIn(400, Easing.OutQuint);
-                }
-                else
-                {
-                    controlPoints.FadeOut(200, Easing.OutQuint);
-
-                    // likewise, delay the resize until the fade is complete.
-                    this.Delay(180).ResizeHeightTo(timeline_height, 200, Easing.OutQuint);
-                    mainContent.Delay(180).MoveToY(0, 200, Easing.OutQuint);
-                }
-            }, true);
         }
 
         private void updateWaveformOpacity() =>

diff --git a/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs b/osu.Game/Screens/Edit/EditorScreenWithTimeline.cs
@@ -106,18 +106,10 @@ protected override void LoadComplete()
                 MainContent.Add(content);
                 content.FadeInFromZero(300, Easing.OutQuint);
 
-                LoadComponentAsync(TimelineArea = new TimelineArea(CreateTimelineContent()), timeline =>
-                {
-                    ConfigureTimeline(timeline);
-                    timelineContent.Add(timeline);
-                });
+                LoadComponentAsync(TimelineArea = new TimelineArea(CreateTimelineContent()), timelineContent.Add);
             });
         }
 
-        protected virtual void ConfigureTimeline(TimelineArea timelineArea)
-        {
-        }
-
         protected abstract Drawable CreateMainContent();
 
         protected virtual Drawable CreateTimelineContent() => new Container();

diff --git a/osu.Game/Screens/Edit/Timing/TimingScreen.cs b/osu.Game/Screens/Edit/Timing/TimingScreen.cs
@@ -6,7 +6,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Screens.Edit.Compose.Components.Timeline;
 
 namespace osu.Game.Screens.Edit.Timing
 {
@@ -54,12 +53,5 @@ protected override void LoadComplete()
                 SelectedGroup.Value = EditorBeatmap.ControlPointInfo.GroupAt(nearestTimingPoint.Time);
             }
         }
-
-        protected override void ConfigureTimeline(TimelineArea timelineArea)
-        {
-            base.ConfigureTimeline(timelineArea);
-
-            timelineArea.Timeline.AlwaysShowControlPoints = true;
-        }
     }
 }