From e12fa4943609ff0b379878a819292606481e90be Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Thu, 12 Oct 2017 15:37:00 +0900
Subject: [PATCH] Integrate timeline into Compose

---
 osu.Game/Screens/Edit/Screens/Compose/Compose.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Screens/Compose/Compose.cs b/osu.Game/Screens/Edit/Screens/Compose/Compose.cs
index 2fe40dd010..2349c261cf 100644
--- a/osu.Game/Screens/Edit/Screens/Compose/Compose.cs
+++ b/osu.Game/Screens/Edit/Screens/Compose/Compose.cs
@@ -6,6 +6,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Screens.Edit.Screens.Compose.Timeline;
 
 namespace osu.Game.Screens.Edit.Screens.Compose
 {
@@ -13,6 +14,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
     {
         public Compose()
         {
+            ScrollableTimeline timeline;
             Children = new[]
             {
                 new Container
@@ -31,11 +33,22 @@ namespace osu.Game.Screens.Edit.Screens.Compose
                         {
                             Name = "Content",
                             RelativeSizeAxes = Axes.Both,
-                            Padding = new MarginPadding { Horizontal = 17, Vertical = 10 }
+                            Padding = new MarginPadding { Horizontal = 17, Vertical = 10 },
+                            Children = new Drawable[]
+                            {
+                                new Container
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Padding = new MarginPadding { Right = 115 },
+                                    Child = timeline = new ScrollableTimeline { RelativeSizeAxes = Axes.Both }
+                                }
+                            }
                         }
                     }
                 }
             };
+
+            timeline.Beatmap.BindTo(Beatmap);
         }
     }
 }