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;