From 29adedfa96bf0882f4f54b4727069eca8a35cbac Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 16 Feb 2018 11:17:28 +0900
Subject: [PATCH] Collapse visual settings by default in player

---
 .../Screens/Play/HUD/PlayerSettingsOverlay.cs |  2 +-
 .../PlayerSettings/PlayerSettingsGroup.cs     | 41 +++++++++++--------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
index e6cf1f7982..5dba10ffc1 100644
--- a/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
+++ b/osu.Game/Screens/Play/HUD/PlayerSettingsOverlay.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Screens.Play.HUD
                     //CollectionSettings = new CollectionSettings(),
                     //DiscussionSettings = new DiscussionSettings(),
                     PlaybackSettings = new PlaybackSettings(),
-                    VisualSettings = new VisualSettings()
+                    VisualSettings = new VisualSettings { Expanded = false }
                 }
             };
 
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
index e8a4bc6b27..95b464154a 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
@@ -31,6 +31,28 @@ namespace osu.Game.Screens.Play.PlayerSettings
 
         private bool expanded = true;
 
+        public bool Expanded
+        {
+            get { return expanded; }
+            set
+            {
+                if (expanded == value) return;
+                expanded = value;
+
+                content.ClearTransforms();
+
+                if (expanded)
+                    content.AutoSizeAxes = Axes.Y;
+                else
+                {
+                    content.AutoSizeAxes = Axes.None;
+                    content.ResizeHeightTo(0, transition_duration, Easing.OutQuint);
+                }
+
+                button.FadeColour(expanded ? buttonActiveColour : Color4.White, 200, Easing.OutQuint);
+            }
+        }
+
         private Color4 buttonActiveColour;
 
         protected PlayerSettingsGroup()
@@ -82,7 +104,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
                                     Position = new Vector2(-15, 0),
                                     Icon = FontAwesome.fa_bars,
                                     Scale = new Vector2(0.75f),
-                                    Action = toggleContentVisibility,
+                                    Action = () => Expanded = !Expanded,
                                 },
                             }
                         },
@@ -111,22 +133,5 @@ namespace osu.Game.Screens.Play.PlayerSettings
         }
 
         protected override Container<Drawable> Content => content;
-
-        private void toggleContentVisibility()
-        {
-            content.ClearTransforms();
-
-            expanded = !expanded;
-
-            if (expanded)
-                content.AutoSizeAxes = Axes.Y;
-            else
-            {
-                content.AutoSizeAxes = Axes.None;
-                content.ResizeHeightTo(0, transition_duration, Easing.OutQuint);
-            }
-
-            button.FadeColour(expanded ? buttonActiveColour : Color4.White, 200, Easing.OutQuint);
-        }
     }
 }