From 8460e29bcbb8da5e69a9e800816f8baa41da49b3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 13 Jul 2017 16:26:40 +0900
Subject: [PATCH] Sidebar now pushes full settings out further

---
 osu.Game/Overlays/Settings/Sidebar.cs | 6 +++---
 osu.Game/Overlays/SettingsOverlay.cs  | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sidebar.cs b/osu.Game/Overlays/Settings/Sidebar.cs
index 6c91f69fd9..ff2386d11b 100644
--- a/osu.Game/Overlays/Settings/Sidebar.cs
+++ b/osu.Game/Overlays/Settings/Sidebar.cs
@@ -50,10 +50,10 @@ namespace osu.Game.Overlays.Settings
 
         protected override bool OnHover(InputState state)
         {
+            expandEvent?.Cancel();
             expandEvent = Scheduler.AddDelayed(() =>
             {
-                expandEvent = null;
-                ResizeTo(new Vector2(EXPANDED_WIDTH, Height), 150, EasingTypes.OutQuad);
+                ResizeTo(new Vector2(EXPANDED_WIDTH, Height), 500, EasingTypes.OutQuint);
             }, 750);
             return true;
         }
@@ -61,7 +61,7 @@ namespace osu.Game.Overlays.Settings
         protected override void OnHoverLost(InputState state)
         {
             expandEvent?.Cancel();
-            ResizeTo(new Vector2(DEFAULT_WIDTH, Height), 150, EasingTypes.OutQuad);
+            ResizeTo(new Vector2(DEFAULT_WIDTH, Height), 500, EasingTypes.OutQuint);
             base.OnHoverLost(state);
         }
 
diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs
index 4a5a0de890..fa55134c1f 100644
--- a/osu.Game/Overlays/SettingsOverlay.cs
+++ b/osu.Game/Overlays/SettingsOverlay.cs
@@ -148,6 +148,13 @@ namespace osu.Game.Overlays
             base.OnFocus(state);
         }
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            sectionsContainer.Margin = new MarginPadding { Left = sidebar.DrawWidth };
+        }
+
         private class SettingsSectionsContainer : SectionsContainer
         {
             public SearchContainer SearchContainer;