From 1209c9fa32e0c0c98497748bb54f39760007408c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 14 Apr 2021 19:39:12 +0900
Subject: [PATCH] Allow timeline to expand in height when control points are to
 be displayed

---
 .../Compose/Components/Timeline/Timeline.cs   | 39 ++++++++++++++++---
 .../Timeline/TimelineControlPointDisplay.cs   |  6 ---
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
index d06f977fc9..bd7b426044 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
@@ -57,11 +57,11 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         private Track track;
 
         private const float timeline_height = 90;
+        private const float timeline_expanded_height = 180;
 
         public Timeline()
         {
             RelativeSizeAxes = Axes.X;
-            Height = timeline_height;
 
             ZoomDuration = 200;
             ZoomEasing = Easing.OutQuint;
@@ -86,9 +86,17 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 
             AddRange(new Drawable[]
             {
+                controlPoints = new TimelineControlPointDisplay
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = timeline_expanded_height,
+                },
                 new Container
                 {
-                    RelativeSizeAxes = Axes.Both,
+                    RelativeSizeAxes = Axes.X,
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                    Height = timeline_height,
                     Depth = float.MaxValue,
                     Children = new[]
                     {
@@ -102,7 +110,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
                         },
                         centreMarker.CreateProxy(),
                         ticks = new TimelineTickDisplay(),
-                        controlPoints = new TimelineControlPointDisplay(),
                         new Box
                         {
                             Name = "zero marker",
@@ -116,13 +123,35 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             });
 
             waveformOpacity = config.GetBindable<float>(OsuSetting.EditorWaveformOpacity);
+            Beatmap.BindTo(beatmap);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
             waveformOpacity.BindValueChanged(_ => updateWaveformOpacity(), true);
 
             WaveformVisible.ValueChanged += _ => updateWaveformOpacity();
-            ControlPointsVisible.ValueChanged += visible => controlPoints.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
             TicksVisible.ValueChanged += visible => ticks.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint);
+            ControlPointsVisible.BindValueChanged(visible =>
+            {
+                if (visible.NewValue)
+                {
+                    this.ResizeHeightTo(timeline_expanded_height, 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);
+                }
+            }, true);
 
-            Beatmap.BindTo(beatmap);
             Beatmap.BindValueChanged(b =>
             {
                 waveform.Waveform = b.NewValue.Waveform;
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
index 18600bcdee..8520567fa9 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -4,7 +4,6 @@
 using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Screens.Edit.Components.Timelines.Summary.Parts;
 
@@ -17,11 +16,6 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
     {
         private readonly IBindableList<ControlPointGroup> controlPointGroups = new BindableList<ControlPointGroup>();
 
-        public TimelineControlPointDisplay()
-        {
-            RelativeSizeAxes = Axes.Both;
-        }
-
         protected override void LoadBeatmap(EditorBeatmap beatmap)
         {
             base.LoadBeatmap(beatmap);