From 7168e8fd99e20dc43b7f80e78540ebdd089d5b7f Mon Sep 17 00:00:00 2001
From: smoogipooo <smoogipooo@gmail.com>
Date: Wed, 20 Sep 2017 18:16:03 +0900
Subject: [PATCH] Improve layout of bottom bar in the Editor

---
 osu.Game/Screens/Edit/Editor.cs | 44 +++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 04f45d9a34..b482061cd8 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -15,17 +15,18 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Edit.Menus;
 using osu.Game.Screens.Edit.Components;
 using OpenTK;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Screens.Edit
 {
-    internal class Editor : ScreenWhiteBox
+    internal class Editor : OsuScreen
     {
-        protected override IEnumerable<Type> PossibleChildren => new[] { typeof(EditSongSelect) };
-
         protected override BackgroundScreen CreateBackground() => new BackgroundScreenCustom(@"Backgrounds/bg4");
 
         internal override bool ShowOverlays => false;
 
+        private readonly Box bottomBackground;
+
         public Editor()
         {
             Add(new Container
@@ -192,22 +193,45 @@ namespace osu.Game.Screens.Edit
                 }
             });
 
-            Add(new FillFlowContainer
+            Add(new Container
             {
-                Name = "Bottom bar",
                 Anchor = Anchor.BottomLeft,
                 Origin = Anchor.BottomLeft,
                 RelativeSizeAxes = Axes.X,
                 Height = 60,
-                Padding = new MarginPadding { Top = 5, Bottom = 5, Left = 10, Right = 10 },
-                Direction = FillDirection.Horizontal,
-                Spacing = new Vector2(10, 0),
-                Children = new[]
+                Children = new Drawable[]
                 {
-                    new SummaryTimeline { RelativeSizeAxes = Axes.Both }
+                    bottomBackground = new Box { RelativeSizeAxes = Axes.Both },
+                    new Container
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Padding = new MarginPadding { Top = 5, Bottom = 5, Left = 10, Right = 10 },
+                        Child = new FillFlowContainer
+                        {
+                            Name = "Bottom bar",
+                            RelativeSizeAxes = Axes.Both,
+                            Direction = FillDirection.Horizontal,
+                            Spacing = new Vector2(10, 0),
+                            Children = new[]
+                            {
+                                new SummaryTimeline
+                                {
+                                    Anchor = Anchor.Centre,
+                                    Origin = Anchor.Centre,
+                                    RelativeSizeAxes = Axes.Both,
+                                    Width = 0.65f
+                                }
+                            }
+                        }
+                    }
                 }
             });
+        }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            bottomBackground.Colour = colours.Gray2;
         }
 
         protected override void OnResuming(Screen last)