Fix much dropdown shit.

osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs

@@ -0,0 +1,57 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using OpenTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuDropDownHeader : DropDownHeader
+    {
+        private SpriteText label;
+        protected override string Label
+        {
+            get { return label.Text; }
+            set { label.Text = value; }
+        }
+
+        public OsuDropDownHeader()
+        {
+            Foreground.Padding = new MarginPadding(4);
+
+            AutoSizeAxes = Axes.None;
+            Margin = new MarginPadding { Bottom = 4 };
+            CornerRadius = 4;
+            Height = 40;
+
+            Children = new[]
+            {
+                label = new OsuSpriteText
+                {
+                    Anchor = Anchor.CentreLeft,
+                    Origin = Anchor.CentreLeft,
+                },
+                new TextAwesome
+                {
+                    Icon = FontAwesome.fa_chevron_down,
+                    Anchor = Anchor.CentreRight,
+                    Origin = Anchor.CentreRight,
+                    Margin = new MarginPadding { Right = 4 },
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            BackgroundColour = Color4.Black.Opacity(0.5f);
+            BackgroundColourHover = colours.PinkDarker;
+        }
+    }
+}

osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs

@@ -0,0 +1,54 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using osu.Framework.Graphics.Transformations;
+using osu.Framework.Graphics.UserInterface;
+using OpenTK;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuDropDownMenu<U> : DropDownMenu<U>
+    {
+        protected override DropDownHeader CreateHeader() => new OsuDropDownHeader();
+
+        protected override IEnumerable<DropDownMenuItem<U>> GetDropDownItems(IEnumerable<U> values)
+        {
+            return values.Select(v =>
+            {
+                var field = typeof(U).GetField(Enum.GetName(typeof(U), v));
+                return new OsuDropDownMenuItem<U>(
+                    field.GetCustomAttribute<DescriptionAttribute>()?.Description ?? field.Name, v);
+            });
+
+        }
+
+        public OsuDropDownMenu()
+        {
+            //TODO: breaks padding; figure why.
+            //ContentContainer.CornerRadius = 4;
+        }
+
+        protected override void AnimateOpen()
+        {
+            ContentContainer.FadeIn(300, EasingTypes.OutQuint);
+        }
+
+        protected override void AnimateClose()
+        {
+            ContentContainer.FadeOut(300, EasingTypes.OutQuint);
+        }
+
+        protected override void UpdateContentHeight()
+        {
+            if (State == DropDownMenuState.Opened)
+                ContentContainer.ResizeTo(new Vector2(1, ContentHeight), 300, EasingTypes.OutQuint);
+            else
+                ContentContainer.ResizeTo(new Vector2(1, 0), 300, EasingTypes.OutQuint);
+        }
+    }
+}

osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs

@@ -0,0 +1,57 @@
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.UserInterface;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using OpenTK.Graphics;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuDropDownMenuItem<U> : DropDownMenuItem<U>
+    {
+        public OsuDropDownMenuItem(string text, U value) : base(text, value)
+        {
+            Foreground.Padding = new MarginPadding(2);
+
+            Children = new[]
+            {
+                new FlowContainer
+                {
+                    Direction = FlowDirection.HorizontalOnly,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
+                    {
+                        new TextAwesome
+                        {
+                            Icon = FontAwesome.fa_chevron_right,
+                            Colour = Color4.Black,
+                            TextSize = 12,
+                            Margin = new MarginPadding { Right = 3 },
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                        },
+                        new OsuSpriteText {
+                            Text = text,
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                        }
+                    }
+                }
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            BackgroundColour = Color4.Black.Opacity(0.5f);
+            BackgroundColourHover = colours.PinkDarker;
+            BackgroundColourSelected = Color4.Black.Opacity(0.5f);
+        }
+    }
+}

osu.Game/Overlays/Options/OptionDropdown.cs

@@ -1,23 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionDropdown<T> : FlowContainer
+    public class OptionDropDown<T> : FlowContainer
     {
         private DropDownMenu<T> dropdown;
         private SpriteText text;
@@ -28,7 +21,6 @@ namespace osu.Game.Overlays.Options
             set
             {
                 text.Text = value;
-                text.Alpha = string.IsNullOrEmpty(value) ? 0 : 1;
             }
         }
 
@@ -64,7 +56,7 @@ namespace osu.Game.Overlays.Options
             base.Dispose(isDisposing);
         }
 
-        public OptionDropdown()
+        public OptionDropDown()
         {
             if (!typeof(T).IsEnum)
                 throw new InvalidOperationException("OptionsDropdown only supports enums as the generic type argument");
@@ -76,7 +68,7 @@ namespace osu.Game.Overlays.Options
                 text = new OsuSpriteText {
                     Alpha = 0,
                 },
-                dropdown = new StyledDropDownMenu<T>
+                dropdown = new OsuDropDownMenu<T>
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
@@ -85,137 +77,5 @@ namespace osu.Game.Overlays.Options
             };
             dropdown.ValueChanged += Dropdown_ValueChanged;
         }
-
-        private class StyledDropDownMenu<U> : DropDownMenu<U>
-        {
-            protected override float DropDownListSpacing => 4;
-
-            protected override DropDownComboBox CreateComboBox()
-            {
-                return new StyledDropDownComboBox();
-            }
-
-            protected override IEnumerable<DropDownMenuItem<U>> GetDropDownItems(IEnumerable<U> values)
-            {
-                return values.Select(v =>
-                {
-                    var field = typeof(U).GetField(Enum.GetName(typeof(U), v));
-                    return new StyledDropDownMenuItem<U>(
-                        field.GetCustomAttribute<DescriptionAttribute>()?.Description ?? field.Name, v);
-                });
-
-            }
-
-            public StyledDropDownMenu()
-            {
-                ComboBox.CornerRadius = 4;
-                DropDown.CornerRadius = 4;
-            }
-
-            protected override void AnimateOpen()
-            {
-                foreach (StyledDropDownMenuItem<U> child in DropDownItemsContainer.Children)
-                {
-                    child.FadeIn(200);
-                    child.ResizeTo(new Vector2(1, 24), 200);
-                }
-                DropDown.Show();
-            }
-
-            protected override void AnimateClose()
-            {
-                foreach (StyledDropDownMenuItem<U> child in DropDownItemsContainer.Children)
-                {
-                    child.ResizeTo(new Vector2(1, 0), 200);
-                    child.FadeOut(200);
-                }
-            }
-        }
-
-        private class StyledDropDownComboBox : DropDownComboBox
-        {
-            private SpriteText label;
-            protected override string Label
-            {
-                get { return label.Text; }
-                set { label.Text = value; }
-            }
-
-            public StyledDropDownComboBox()
-            {
-                Foreground.Padding = new MarginPadding(4);
-
-                AutoSizeAxes = Axes.None;
-                Height = 40;
-
-                Children = new[]
-                {
-                    label = new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                    },
-                    new TextAwesome
-                    {
-                        Icon = FontAwesome.fa_chevron_down,
-                        Anchor = Anchor.CentreRight,
-                        Origin = Anchor.CentreRight,
-                        Margin = new MarginPadding { Right = 4 },
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BackgroundColour = Color4.Black.Opacity(0.5f);
-                BackgroundColourHover = colours.PinkDarker;
-            }
-        }
-
-        private class StyledDropDownMenuItem<U> : DropDownMenuItem<U>
-        {
-            public StyledDropDownMenuItem(string text, U value) : base(text, value)
-            {
-                AutoSizeAxes = Axes.None;
-                Height = 0;
-                Foreground.Padding = new MarginPadding(2);
-
-                Children = new[]
-                {
-                    new FlowContainer
-                    {
-                        Direction = FlowDirection.HorizontalOnly,
-                        RelativeSizeAxes = Axes.X,
-                        AutoSizeAxes = Axes.Y,
-                        Children = new Drawable[]
-                        {
-                            new TextAwesome
-                            {
-                                Icon = FontAwesome.fa_chevron_right,
-                                Colour = Color4.Black,
-                                TextSize = 12,
-                                Margin = new MarginPadding { Right = 3 },
-                                Origin = Anchor.CentreLeft,
-                                Anchor = Anchor.CentreLeft,
-                            },
-                            new OsuSpriteText {
-                                Text = text,
-                                Origin = Anchor.CentreLeft,
-                                Anchor = Anchor.CentreLeft,
-                            }
-                        }
-                    }
-                };
-            }
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BackgroundColour = Color4.Black.Opacity(0.5f);
-                BackgroundColourHover = colours.PinkDarker;
-                BackgroundColourSelected = Color4.Black.Opacity(0.5f);
-            }
-        }
     }
 }

osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs

@@ -1,12 +1,12 @@
-//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
+//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
-//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
+
-using osu.Framework.Allocation;
+using osu.Framework.Allocation;
-using osu.Framework.Configuration;
+using osu.Framework.Configuration;
-using osu.Framework.Graphics;
+using osu.Framework.Graphics;
-using osu.Game.Configuration;
+using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
+using osu.Game.Graphics.UserInterface;
-
+
 namespace osu.Game.Overlays.Options.Sections.Gameplay
 {
     public class GeneralOptions : OptionsSubsection
@@ -23,12 +23,12 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay
                     LabelText = "Background dim",
                     Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.DimLevel)
                 },
-                new OptionDropdown<ProgressBarType>
+                new OptionDropDown<ProgressBarType>
                 {
                     LabelText = "Progress display",
                     Bindable = config.GetBindable<ProgressBarType>(OsuConfig.ProgressBarType)
                 },
-                new OptionDropdown<ScoreMeterType>
+                new OptionDropDown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",
                     Bindable = config.GetBindable<ScoreMeterType>(OsuConfig.ScoreMeter)

osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Options.Sections.General
         {
             Children = new Drawable[]
             {
-                new OptionDropdown<ReleaseStream>
+                new OptionDropDown<ReleaseStream>
                 {
                     LabelText = "Release stream",
                     Bindable = config.GetBindable<ReleaseStream>(OsuConfig.ReleaseStream),

osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs

@@ -57,7 +57,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
                     LabelText = "Softening filter",
                     Bindable = config.GetBindable<bool>(OsuConfig.BloomSoftening)
                 },
-                new OptionDropdown<ScreenshotFormat>
+                new OptionDropDown<ScreenshotFormat>
                 {
                     LabelText = "Screenshot",
                     Bindable = config.GetBindable<ScreenshotFormat>(OsuConfig.ScreenshotFormat)

osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs

@@ -20,7 +20,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
             Children = new Drawable[]
             {
                 // TODO: this needs to be a custom dropdown at some point
-                new OptionDropdown<FrameSync>
+                new OptionDropDown<FrameSync>
                 {
                     LabelText = "Frame limiter",
                     Bindable = config.GetBindable<FrameSync>(FrameworkConfig.FrameSync)

osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs

@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Options.Sections.Input
                     LabelText = "Map absolute raw input to the osu! window",
                     Bindable = config.GetBindable<bool>(OsuConfig.AbsoluteToOsuWindow)
                 },
-                new OptionDropdown<ConfineMouseMode>
+                new OptionDropDown<ConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor",
                     Bindable = config.GetBindable<ConfineMouseMode>(OsuConfig.ConfineMouse),

osu.Game/osu.Game.csproj

@@ -98,6 +98,9 @@
     <Compile Include="Beatmaps\Timing\TimingChange.cs" />
     <Compile Include="Configuration\OsuConfigManager.cs" />
     <Compile Include="Overlays\Options\OptionLabel.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropDownHeader.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropDownMenu.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropDownMenuItem.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarHomeButton.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarMusicButton.cs" />
     <Compile Include="Overlays\Toolbar\ToolbarSettingsButton.cs" />
@@ -234,7 +237,7 @@
     <Compile Include="Overlays\Options\OptionTextBox.cs" />
     <Compile Include="Overlays\Options\OptionSlider.cs" />
     <Compile Include="Configuration\ProgressBarType.cs" />
-    <Compile Include="Overlays\Options\OptionDropdown.cs" />
+    <Compile Include="Overlays\Options\OptionDropDown.cs" />
     <Compile Include="Configuration\RankingType.cs" />
     <Compile Include="Configuration\ScoreMeterType.cs" />
     <Compile Include="Configuration\ReleaseStream.cs" />
@@ -280,4 +283,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>