From 6ceac8ab0a316437d1dfed2c133927e2496c71f3 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 24 May 2018 15:23:59 +0900
Subject: [PATCH 1/3] Add a centre marker to the timeline

---
 .../Visual/TestCaseEditorComposeTimeline.cs   |  9 +++-
 .../Screens/Compose/Timeline/CentreMarker.cs  | 52 +++++++++++++++++++
 .../Edit/Screens/Compose/Timeline/Timeline.cs |  6 +++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Screens/Edit/Screens/Compose/Timeline/CentreMarker.cs

diff --git a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
index c0557982fb..d731ef973a 100644
--- a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
@@ -15,7 +15,14 @@ namespace osu.Game.Tests.Visual
     [TestFixture]
     public class TestCaseEditorComposeTimeline : EditorClockTestCase
     {
-        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(TimelineArea), typeof(Timeline), typeof(TimelineButton) };
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(TimelineArea),
+            typeof(Timeline),
+            typeof(BeatmapWaveformGraph),
+            typeof(TimelineButton),
+            typeof(CentreMarker)
+        };
 
         public TestCaseEditorComposeTimeline()
         {
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/CentreMarker.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/CentreMarker.cs
new file mode 100644
index 0000000000..8e932f307d
--- /dev/null
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/CentreMarker.cs
@@ -0,0 +1,52 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using OpenTK;
+
+namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
+{
+    public class CentreMarker : CompositeDrawable
+    {
+        private const float triangle_width = 20;
+        private const float triangle_height = 10;
+        private const float bar_width = 2;
+
+        public CentreMarker()
+        {
+            RelativeSizeAxes = Axes.Y;
+            Size = new Vector2(20, 1);
+
+            Anchor = Anchor.Centre;
+            Origin = Anchor.Centre;
+
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Y,
+                    Width = bar_width,
+                },
+                new Triangle
+                {
+                    Anchor = Anchor.TopCentre,
+                    Origin = Anchor.BottomCentre,
+                    Size = new Vector2(triangle_width, triangle_height),
+                    Scale = new Vector2(1, -1)
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Colour = colours.Red;
+        }
+    }
+}
diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
index daf67ed7f0..d5f47f5e04 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
@@ -41,6 +41,12 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
                 Depth = float.MaxValue
             };
 
+            // We don't want the centre marker to scroll
+            AddInternal(new CentreMarker());
+
+            // Make sure that the scrollbar is above the centre marker
+            ChangeInternalChildDepth(Scrollbar, -1);
+
             WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible ? 1 : 0, 200, Easing.OutQuint);
 
             Beatmap.BindTo(beatmap);

From 7dfe171869ed7b0596c30620f55ea834636628c2 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 12 Jun 2018 14:31:12 +0900
Subject: [PATCH 2/3] Fix rebase error

---
 osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
index d731ef973a..a89c5767fc 100644
--- a/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
@@ -19,7 +19,6 @@ namespace osu.Game.Tests.Visual
         {
             typeof(TimelineArea),
             typeof(Timeline),
-            typeof(BeatmapWaveformGraph),
             typeof(TimelineButton),
             typeof(CentreMarker)
         };

From bec6e3083ec27fd25205a343470f0c9c6ad7a43b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 18 Jun 2018 03:19:21 +0900
Subject: [PATCH 3/3] Remove scrollbar depth change as scrollbar is hidden now

---
 osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs b/osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
index 489233e256..36f76b013a 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
@@ -45,9 +45,6 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
             // We don't want the centre marker to scroll
             AddInternal(new CentreMarker());
 
-            // Make sure that the scrollbar is above the centre marker
-            ChangeInternalChildDepth(Scrollbar, -1);
-
             WaveformVisible.ValueChanged += visible => waveform.FadeTo(visible ? 1 : 0, 200, Easing.OutQuint);
 
             Beatmap.BindTo(beatmap);