From b6398a1c778382a1b59fdf184182458c5e162ed8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Feb 2017 20:14:17 +0900
Subject: [PATCH] Centralise toolbar size variables and adjust to design.

---
 osu.Game/Overlays/Options/Sidebar.cs           |  3 ++-
 osu.Game/Overlays/Toolbar/Toolbar.cs           |  2 +-
 osu.Game/Overlays/Toolbar/ToolbarButton.cs     | 10 ++++++----
 osu.Game/Overlays/Toolbar/ToolbarUserButton.cs |  2 ++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Overlays/Options/Sidebar.cs b/osu.Game/Overlays/Options/Sidebar.cs
index b0762f3fd5..57865b84a7 100644
--- a/osu.Game/Overlays/Options/Sidebar.cs
+++ b/osu.Game/Overlays/Options/Sidebar.cs
@@ -11,13 +11,14 @@ using osu.Framework.Graphics.Transformations;
 using osu.Framework.Input;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
+using osu.Game.Overlays.Toolbar;
 
 namespace osu.Game.Overlays.Options
 {
     public class Sidebar : Container
     {
         private FlowContainer content;
-        internal const int DEFAULT_WIDTH = 60;
+        internal const float DEFAULT_WIDTH = ToolbarButton.WIDTH;
         internal const int EXPANDED_WIDTH = 200;
         protected override Container<Drawable> Content => content;
 
diff --git a/osu.Game/Overlays/Toolbar/Toolbar.cs b/osu.Game/Overlays/Toolbar/Toolbar.cs
index bc81e51daa..1b6abb475c 100644
--- a/osu.Game/Overlays/Toolbar/Toolbar.cs
+++ b/osu.Game/Overlays/Toolbar/Toolbar.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Toolbar
 {
     public class Toolbar : OverlayContainer
     {
-        public const float HEIGHT = 50;
+        public const float HEIGHT = 40;
 
         public Action OnHome;
         public Action<PlayMode> OnPlayModeChange;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 919818dd54..160e4460d9 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -21,6 +21,8 @@ namespace osu.Game.Overlays.Toolbar
 {
     public class ToolbarButton : Container
     {
+        public const float WIDTH = Toolbar.HEIGHT * 1.4f;
+
         public FontAwesome Icon
         {
             get { return DrawableIcon.Icon; }
@@ -66,6 +68,9 @@ namespace osu.Game.Overlays.Toolbar
 
         public ToolbarButton()
         {
+            Width = WIDTH;
+            RelativeSizeAxes = Axes.Y;
+
             Children = new Drawable[]
             {
                 HoverBackground = new Box
@@ -80,7 +85,7 @@ namespace osu.Game.Overlays.Toolbar
                     Direction = FlowDirection.HorizontalOnly,
                     Anchor = Anchor.TopCentre,
                     Origin = Anchor.TopCentre,
-                    Padding = new MarginPadding { Left = 20, Right = 20 },
+                    Padding = new MarginPadding { Left = Toolbar.HEIGHT / 2, Right = Toolbar.HEIGHT / 2 },
                     Spacing = new Vector2(5),
                     RelativeSizeAxes = Axes.Y,
                     AutoSizeAxes = Axes.X,
@@ -121,9 +126,6 @@ namespace osu.Game.Overlays.Toolbar
                     }
                 }
             };
-
-            RelativeSizeAxes = Axes.Y;
-            AutoSizeAxes = Axes.X;
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index 60d0eaacda..921c2d26df 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Overlays.Toolbar
 
         public ToolbarUserButton()
         {
+            AutoSizeAxes = Axes.X;
+
             DrawableText.Font = @"Exo2.0-MediumItalic";
 
             Add(new OpaqueBackground { Depth = 1 });