From 1d13924e0a9051d8f5582b9922c0e8bcd27d2a54 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Tue, 21 Mar 2017 01:05:48 +0800
Subject: [PATCH 01/21] Remove redundant type parameter. Nested type has
 implicit type parameter from base type.

---
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index d5699eddaf..de81757fdf 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected override DropDownMenu<T> CreateDropDownMenu() => new OsuTabDropDownMenu<T>();
+        protected override DropDownMenu<T> CreateDropDownMenu() => new OsuTabDropDownMenu();
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
 
@@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 accentColour = value;
-                var dropDown = DropDown as OsuTabDropDownMenu<T>;
+                var dropDown = DropDown as OsuTabDropDownMenu;
                 if (dropDown != null)
                     dropDown.AccentColour = value;
                 foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
@@ -53,7 +53,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public class OsuTabDropDownMenu<T1> : OsuDropDownMenu<T1>
+        public class OsuTabDropDownMenu : OsuDropDownMenu<T>
         {
             protected override DropDownHeader CreateHeader() => new OsuTabDropDownHeader
             {
@@ -62,7 +62,7 @@ namespace osu.Game.Graphics.UserInterface
                 Origin = Anchor.TopRight,
             };
 
-            protected override DropDownMenuItem<T1> CreateDropDownItem(string key, T1 value)
+            protected override DropDownMenuItem<T> CreateDropDownItem(string key, T value)
             {
                 var item = base.CreateDropDownItem(key, value);
                 item.ForegroundColourHover = Color4.Black;

From f0edf5d3d3ec772961c51cce18e45af51c199b61 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 06:51:26 +0800
Subject: [PATCH 02/21] Update to DropDown and Menu.

---
 .../Graphics/UserInterface/OsuDropDown.cs     | 40 ++++++++++++
 .../Graphics/UserInterface/OsuDropDownMenu.cs | 61 -------------------
 osu.Game/Graphics/UserInterface/OsuMenu.cs    | 34 +++++++++++
 .../Graphics/UserInterface/OsuTabControl.cs   | 20 +++---
 osu.Game/Overlays/Options/OptionDropDown.cs   |  4 +-
 osu.Game/osu.Game.csproj                      |  3 +-
 6 files changed, 88 insertions(+), 74 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/OsuDropDown.cs
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
 create mode 100644 osu.Game/Graphics/UserInterface/OsuMenu.cs

diff --git a/osu.Game/Graphics/UserInterface/OsuDropDown.cs b/osu.Game/Graphics/UserInterface/OsuDropDown.cs
new file mode 100644
index 0000000000..51fb335698
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuDropDown.cs
@@ -0,0 +1,40 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.Linq;
+using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics.UserInterface;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuDropDown<T> : DropDown<T>
+    {
+        protected override DropDownHeader CreateHeader() => new OsuDropDownHeader { AccentColour = AccentColour };
+
+        protected override Menu CreateMenu() => new OsuMenu();
+
+        private Color4? accentColour;
+        public virtual Color4 AccentColour
+        {
+            get { return accentColour.GetValueOrDefault(); }
+            set
+            {
+                accentColour = value;
+                if (Header != null)
+                    ((OsuDropDownHeader)Header).AccentColour = value;
+                foreach (var item in MenuItems.OfType<OsuDropDownMenuItem<T>>())
+                    item.AccentColour = value;
+            }
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            if (accentColour == null)
+                AccentColour = colours.PinkDarker;
+        }
+
+        protected override DropDownMenuItem<T> CreateMenuItem(string key, T value) => new OsuDropDownMenuItem<T>(key, value) { AccentColour = AccentColour };
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs b/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
deleted file mode 100644
index 5d9e30db8d..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuDropDownMenu.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System.Linq;
-using osu.Framework.Allocation;
-using OpenTK;
-using OpenTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.Graphics.UserInterface;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuDropDownMenu<T> : DropDownMenu<T>
-    {
-        protected override DropDownHeader CreateHeader() => new OsuDropDownHeader { AccentColour = AccentColour };
-
-        private Color4? accentColour;
-        public virtual Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                if (Header != null)
-                    ((OsuDropDownHeader)Header).AccentColour = value;
-                foreach (var item in ItemList.OfType<OsuDropDownMenuItem<T>>())
-                    item.AccentColour = value;
-            }
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            if (accentColour == null)
-                AccentColour = colours.PinkDarker;
-        }
-
-        public OsuDropDownMenu()
-        {
-            ContentContainer.CornerRadius = 4;
-            ContentBackground.Colour = Color4.Black.Opacity(0.5f);
-
-            DropDownItemsContainer.Padding = new MarginPadding(5);
-        }
-
-        protected override void AnimateOpen() => ContentContainer.FadeIn(300, EasingTypes.OutQuint);
-
-        protected override void AnimateClose() => ContentContainer.FadeOut(300, EasingTypes.OutQuint);
-
-        protected override void UpdateContentHeight()
-        {
-            var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight;
-            ContentContainer.ResizeTo(new Vector2(1, State == DropDownMenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
-        }
-
-        protected override DropDownMenuItem<T> CreateDropDownItem(string key, T value) => new OsuDropDownMenuItem<T>(key, value) { AccentColour = AccentColour };
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs
new file mode 100644
index 0000000000..4e80e1502a
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs
@@ -0,0 +1,34 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK;
+using OpenTK.Graphics;
+using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Transforms;
+using osu.Framework.Graphics.UserInterface;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public class OsuMenu : Menu
+    {
+        public OsuMenu()
+        {
+            CornerRadius = 4;
+            ContentBackground.Colour = Color4.Black.Opacity(0.5f);
+
+            ItemsContainer.Padding = new MarginPadding(5);
+        }
+
+        protected override void AnimateOpen() => FadeIn(300, EasingTypes.OutQuint);
+
+        protected override void AnimateClose() => FadeOut(300, EasingTypes.OutQuint);
+
+        protected override void UpdateContentHeight()
+        {
+            var actualHeight = (RelativeSizeAxes & Axes.Y) > 0 ? 1 : ContentHeight;
+            ResizeTo(new Vector2(1, State == MenuState.Opened ? actualHeight : 0), 300, EasingTypes.OutQuint);
+        }
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index de81757fdf..947b39f621 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected override DropDownMenu<T> CreateDropDownMenu() => new OsuTabDropDownMenu();
+        protected override DropDown<T> CreateDropDownMenu() => new OsuTabDropDown();
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
 
@@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 accentColour = value;
-                var dropDown = DropDown as OsuTabDropDownMenu;
+                var dropDown = DropDown as OsuTabDropDown;
                 if (dropDown != null)
                     dropDown.AccentColour = value;
                 foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
@@ -53,7 +53,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public class OsuTabDropDownMenu : OsuDropDownMenu<T>
+        public class OsuTabDropDown : OsuDropDown<T>
         {
             protected override DropDownHeader CreateHeader() => new OsuTabDropDownHeader
             {
@@ -62,22 +62,22 @@ namespace osu.Game.Graphics.UserInterface
                 Origin = Anchor.TopRight,
             };
 
-            protected override DropDownMenuItem<T> CreateDropDownItem(string key, T value)
+            protected override DropDownMenuItem<T> CreateMenuItem(string key, T value)
             {
-                var item = base.CreateDropDownItem(key, value);
+                var item = base.CreateMenuItem(key, value);
                 item.ForegroundColourHover = Color4.Black;
                 return item;
             }
 
-            public OsuTabDropDownMenu()
+            public OsuTabDropDown()
             {
-                ContentContainer.Anchor = Anchor.TopRight;
-                ContentContainer.Origin = Anchor.TopRight;
+                DropDownMenu.Anchor = Anchor.TopRight;
+                DropDownMenu.Origin = Anchor.TopRight;
 
                 RelativeSizeAxes = Axes.X;
 
-                ContentBackground.Colour = Color4.Black.Opacity(0.7f);
-                MaxDropDownHeight = 400;
+                DropDownMenu.Colour = Color4.Black.Opacity(0.7f);
+                DropDownMenu.MaxHeight = 400;
             }
 
             public class OsuTabDropDownHeader : OsuDropDownHeader
diff --git a/osu.Game/Overlays/Options/OptionDropDown.cs b/osu.Game/Overlays/Options/OptionDropDown.cs
index 4387e90b5a..690d3d21a5 100644
--- a/osu.Game/Overlays/Options/OptionDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionDropDown.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Overlays.Options
 {
     public class OptionDropDown<T> : FillFlowContainer
     {
-        private DropDownMenu<T> dropdown;
+        private DropDown<T> dropdown;
         private SpriteText text;
 
         public string LabelText
@@ -97,7 +97,7 @@ namespace osu.Game.Overlays.Options
                 text = new OsuSpriteText {
                     Alpha = 0,
                 },
-                dropdown = new OsuDropDownMenu<T>
+                dropdown = new OsuDropDown<T>
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 188d929888..3f97e196db 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Graphics\UserInterface\BackButton.cs" />
     <Compile Include="Graphics\UserInterface\FocusedTextBox.cs" />
     <Compile Include="Graphics\UserInterface\Nub.cs" />
+    <Compile Include="Graphics\UserInterface\OsuMenu.cs" />
     <Compile Include="Graphics\UserInterface\OsuPasswordTextBox.cs" />
     <Compile Include="Graphics\UserInterface\OsuSliderBar.cs" />
     <Compile Include="Graphics\UserInterface\OsuTextBox.cs" />
@@ -159,7 +160,7 @@
     <Compile Include="Overlays\Options\OptionDropDown.cs" />
     <Compile Include="Overlays\Options\OptionLabel.cs" />
     <Compile Include="Graphics\UserInterface\OsuDropDownHeader.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDownMenu.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropDown.cs" />
     <Compile Include="Graphics\UserInterface\OsuDropDownMenuItem.cs" />
     <Compile Include="Overlays\Options\OptionsFooter.cs" />
     <Compile Include="Overlays\Options\Sections\DebugSection.cs" />

From b46ded77945cfb9484cb2f797e070b10d8728ca9 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 07:49:21 +0800
Subject: [PATCH 03/21] Use Bindable for DropDown.

---
 osu.Game/Overlays/Options/OptionDropDown.cs | 36 ++-------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Overlays/Options/OptionDropDown.cs b/osu.Game/Overlays/Options/OptionDropDown.cs
index 690d3d21a5..9c9cd17b12 100644
--- a/osu.Game/Overlays/Options/OptionDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionDropDown.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 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 osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -10,7 +10,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.UserInterface;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
-using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Options
 {
@@ -33,12 +32,8 @@ namespace osu.Game.Overlays.Options
             get { return bindable; }
             set
             {
-                if (bindable != null)
-                    bindable.ValueChanged -= bindable_ValueChanged;
                 bindable = value;
-                bindable.ValueChanged += bindable_ValueChanged;
-                bindable_ValueChanged(null, null);
-
+                dropdown.SelectedValue.BindTo(bindable);
                 if (bindable.Disabled)
                     Alpha = 0.3f;
             }
@@ -46,23 +41,6 @@ namespace osu.Game.Overlays.Options
 
         private Bindable<T> bindable;
 
-        private void bindable_ValueChanged(object sender, EventArgs e)
-        {
-            dropdown.SelectedValue = bindable.Value;
-        }
-
-        private void dropdown_ValueChanged(object sender, EventArgs e)
-        {
-            bindable.Value = dropdown.SelectedValue;
-        }
-
-        protected override void Dispose(bool isDisposing)
-        {
-            bindable.ValueChanged -= bindable_ValueChanged;
-            dropdown.ValueChanged -= dropdown_ValueChanged;
-            base.Dispose(isDisposing);
-        }
-
         private IEnumerable<KeyValuePair<string, T>> items;
         public IEnumerable<KeyValuePair<string, T>> Items
         {
@@ -73,15 +51,8 @@ namespace osu.Game.Overlays.Options
             set
             {
                 items = value;
-                if(dropdown != null)
-                {
+                if (dropdown != null)
                     dropdown.Items = value;
-
-                    // We need to refresh the dropdown because our items changed,
-                    // thus its selected value may be outdated.
-                    if (bindable != null)
-                        dropdown.SelectedValue = bindable.Value;
-                }
             }
         }
 
@@ -104,7 +75,6 @@ namespace osu.Game.Overlays.Options
                     Items = Items,
                 }
             };
-            dropdown.ValueChanged += dropdown_ValueChanged;
         }
     }
 }

From b06eb0122c8860fa480081cde2849d162a3e3272 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 07:55:47 +0800
Subject: [PATCH 04/21] Fix for colours and members rename.

---
 osu.Game/Graphics/UserInterface/OsuDropDown.cs   | 2 +-
 osu.Game/Graphics/UserInterface/OsuMenu.cs       | 2 +-
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropDown.cs b/osu.Game/Graphics/UserInterface/OsuDropDown.cs
index 51fb335698..a921be1a1d 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropDown.cs
@@ -35,6 +35,6 @@ namespace osu.Game.Graphics.UserInterface
                 AccentColour = colours.PinkDarker;
         }
 
-        protected override DropDownMenuItem<T> CreateMenuItem(string key, T value) => new OsuDropDownMenuItem<T>(key, value) { AccentColour = AccentColour };
+        protected override DropDownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropDownMenuItem<T>(text, value) { AccentColour = AccentColour };
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs
index 4e80e1502a..95df3be9bf 100644
--- a/osu.Game/Graphics/UserInterface/OsuMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
         public OsuMenu()
         {
             CornerRadius = 4;
-            ContentBackground.Colour = Color4.Black.Opacity(0.5f);
+            Background.Colour = Color4.Black.Opacity(0.5f);
 
             ItemsContainer.Padding = new MarginPadding(5);
         }
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 947b39f621..84f3125ca4 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected override DropDown<T> CreateDropDownMenu() => new OsuTabDropDown();
+        protected override DropDown<T> CreateDropDown() => new OsuTabDropDown();
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
 
@@ -62,9 +62,9 @@ namespace osu.Game.Graphics.UserInterface
                 Origin = Anchor.TopRight,
             };
 
-            protected override DropDownMenuItem<T> CreateMenuItem(string key, T value)
+            protected override DropDownMenuItem<T> CreateMenuItem(string text, T value)
             {
-                var item = base.CreateMenuItem(key, value);
+                var item = base.CreateMenuItem(text, value);
                 item.ForegroundColourHover = Color4.Black;
                 return item;
             }
@@ -76,7 +76,7 @@ namespace osu.Game.Graphics.UserInterface
 
                 RelativeSizeAxes = Axes.X;
 
-                DropDownMenu.Colour = Color4.Black.Opacity(0.7f);
+                DropDownMenu.Background.Colour = Color4.Black.Opacity(0.7f);
                 DropDownMenu.MaxHeight = 400;
             }
 

From 4f3ab879de5385fbc00705d414726095fcb7c56d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 09:43:44 +0900
Subject: [PATCH 05/21] Make DrawableHitObject's UpdateState safer by blocking
 calls at a higher level with not yet loaded.

UpdateState is called in LoadComplete for cases where the state may have changed before a load operation.
---
 osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs    | 2 --
 osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs | 2 --
 osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs       | 2 --
 osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs   | 2 --
 osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs      | 2 --
 osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs        | 3 +++
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
index 20bb937b76..e8c74d4f8d 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -111,8 +111,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             ApproachCircle.FadeOut();
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
index 5e6249d66f..b2af678cae 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableOsuHitObject.cs
@@ -22,8 +22,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             Flush();
 
             UpdateInitialState();
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
index e9db97a67b..a2a52c7d94 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
@@ -158,8 +158,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             ball.FadeIn();
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
index 0400d4a866..fff08b9f60 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSliderTick.cs
@@ -95,8 +95,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             switch (state)
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
index 77bfb97ad4..8098e87b12 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -134,8 +134,6 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
 
         protected override void UpdateState(ArmedState state)
         {
-            if (!IsLoaded) return;
-
             base.UpdateState(state);
 
             Delay(spinner.Duration, true);
diff --git a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
index 3ff30bd90e..6322614496 100644
--- a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
@@ -38,6 +38,9 @@ namespace osu.Game.Modes.Objects.Drawables
                     return;
                 state = value;
 
+                if (!IsLoaded)
+                    return;
+
                 UpdateState(state);
 
                 if (State == ArmedState.Hit)

From 7fba0c4bce787fe8a4e5eda5bb66ba565c158bbe Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 15:44:23 +0900
Subject: [PATCH 06/21] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 405537bd35..24fc560d01 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 405537bd351954878ddc1d2ba53e5d0563528446
+Subproject commit 24fc560d01ba16d86a1c429817ec3b71d146e698

From cc2b4c5c5b4cf2c15687ea942c16334a733c91a7 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 05:54:07 -0400
Subject: [PATCH 07/21] Refactor WorkingBeatmap

Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
---
 .../Beatmaps/TestWorkingBeatmap.cs            |  32 +++++
 .../Tests/TestCaseGamefield.cs                |  13 +-
 .../Tests/TestCasePlayer.cs                   |  12 +-
 .../osu.Desktop.VisualTests.csproj            |   4 +
 osu.Game/Beatmaps/WorkingBeatmap.cs           | 124 ++---------------
 osu.Game/Database/BeatmapDatabase.cs          |  15 +--
 osu.Game/Database/DatabaseWorkingBeatmap.cs   | 127 ++++++++++++++++++
 osu.Game/osu.Game.csproj                      |   1 +
 8 files changed, 176 insertions(+), 152 deletions(-)
 create mode 100644 osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
 create mode 100644 osu.Game/Database/DatabaseWorkingBeatmap.cs

diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
new file mode 100644
index 0000000000..e6236b041f
--- /dev/null
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -0,0 +1,32 @@
+using System;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.IO;
+
+namespace osu.Desktop.VisualTests.Beatmaps
+{
+    public class TestWorkingBeatmap : WorkingBeatmap
+    {
+        public TestWorkingBeatmap(Beatmap beatmap)
+            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+        {
+            this.beatmap = beatmap;
+        }
+
+        private Beatmap beatmap;
+        public override Beatmap Beatmap => beatmap;
+        public override Texture Background => null;
+        public override Track Track => null;
+        
+        public override void Dispose()
+        {
+            // This space intentionally left blank
+        }
+        
+        public override void TransferTo(WorkingBeatmap other)
+        {
+            // This space intentionally left blank
+        }
+    }
+}
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index c2e33f7f32..6de2b36cd0 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -17,6 +17,8 @@ using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using System.Collections.Generic;
+using osu.Framework.Graphics.Textures;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -95,16 +97,5 @@ namespace osu.Desktop.VisualTests.Tests
                 }
             });
         }
-
-        private class TestWorkingBeatmap : WorkingBeatmap
-        {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-            {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
-        }
     }
 }
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index 41bd24b900..21a00ebdf6 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -15,6 +15,7 @@ using osu.Game.Modes.Objects;
 using osu.Game.Modes.Osu.Objects;
 using osu.Game.Screens.Play;
 using OpenTK.Graphics;
+using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {
@@ -97,16 +98,5 @@ namespace osu.Desktop.VisualTests.Tests
                 Beatmap = beatmap
             };
         }
-
-        private class TestWorkingBeatmap : WorkingBeatmap
-        {
-            public TestWorkingBeatmap(Beatmap beatmap)
-                : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-            {
-                Beatmap = beatmap;
-            }
-
-            protected override ArchiveReader GetReader() => null;
-        }
     }
 }
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index 6eb9e5e648..b67b4c4bb3 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -205,9 +205,13 @@
     <Compile Include="Tests\TestCaseDialogOverlay.cs" />
     <Compile Include="Tests\TestCaseBeatmapOptionsOverlay.cs" />
     <Compile Include="Tests\TestCaseLeaderboard.cs" />
+    <Compile Include="Beatmaps\TestWorkingBeatmap.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Beatmaps\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 16db4fc2a6..3be2a40bb0 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -4,14 +4,11 @@
 using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Beatmaps.Formats;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Modes.Mods;
 using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace osu.Game.Beatmaps
 {
@@ -27,131 +24,26 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public PlayMode? PreferredPlayMode;
 
-        public PlayMode PlayMode => beatmap?.BeatmapInfo?.Mode > PlayMode.Osu ? beatmap.BeatmapInfo.Mode : PreferredPlayMode ?? PlayMode.Osu;
+        public PlayMode PlayMode => Beatmap?.BeatmapInfo?.Mode > PlayMode.Osu ? Beatmap.BeatmapInfo.Mode : PreferredPlayMode ?? PlayMode.Osu;
 
         public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>();
 
         public readonly bool WithStoryboard;
 
-        protected abstract ArchiveReader GetReader();
-
         protected WorkingBeatmap(BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
         {
             BeatmapInfo = beatmapInfo;
             BeatmapSetInfo = beatmapSetInfo;
             WithStoryboard = withStoryboard;
         }
+        
+        public abstract Beatmap Beatmap { get; }
+        public abstract Texture Background { get; }
+        public abstract Track Track { get; }
 
-        private Texture background;
-        private object backgroundLock = new object();
-        public Texture Background
-        {
-            get
-            {
-                lock (backgroundLock)
-                {
-                    if (background != null) return background;
+        public abstract void TransferTo(WorkingBeatmap other);
+        public abstract void Dispose();
 
-                    if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
-
-                    try
-                    {
-                        using (var reader = GetReader())
-                            background = new TextureStore(new RawTextureLoaderStore(reader), false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                    }
-                    catch { }
-
-                    return background;
-                }
-            }
-            set { lock (backgroundLock) background = value; }
-        }
-
-        private Beatmap beatmap;
-        private object beatmapLock = new object();
-        public Beatmap Beatmap
-        {
-            get
-            {
-                lock (beatmapLock)
-                {
-                    if (beatmap != null) return beatmap;
-
-                    try
-                    {
-                        using (var reader = GetReader())
-                        {
-                            BeatmapDecoder decoder;
-                            using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                            {
-                                decoder = BeatmapDecoder.GetDecoder(stream);
-                                beatmap = decoder?.Decode(stream);
-                            }
-
-                            if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                                using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                    decoder?.Decode(stream, beatmap);
-                        }
-                    }
-                    catch { }
-
-                    return beatmap;
-                }
-            }
-            set { lock (beatmapLock) beatmap = value; }
-        }
-
-        private ArchiveReader trackReader;
-        private Track track;
-        private object trackLock = new object();
-        public Track Track
-        {
-            get
-            {
-                lock (trackLock)
-                {
-                    if (track != null) return track;
-
-                    try
-                    {
-                        //store a reference to the reader as we may continue accessing the stream in the background.
-                        trackReader = GetReader();
-                        var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                        if (trackData != null)
-                            track = new TrackBass(trackData);
-                    }
-                    catch { }
-
-                    return track;
-                }
-            }
-            set { lock (trackLock) track = value; }
-        }
-
-        public bool TrackLoaded => track != null;
-
-        private bool isDisposed;
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!isDisposed)
-            {
-                track?.Dispose();
-                background?.Dispose();
-                isDisposed = true;
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public void TransferTo(WorkingBeatmap working)
-        {
-            if (track != null && BeatmapInfo.AudioEquals(working.BeatmapInfo))
-                working.track = track;
-        }
+        public virtual bool TrackLoaded => Track != null;
     }
 }
diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index 3f865d65f1..b115b86547 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -18,7 +18,7 @@ using SQLiteNetExtensions.Extensions;
 
 namespace osu.Game.Database
 {
-    public class BeatmapDatabase
+    public partial class BeatmapDatabase
     {
         private SQLiteConnection connection { get; }
         private Storage storage;
@@ -342,18 +342,5 @@ namespace osu.Game.Database
         }
 
         public bool Exists(BeatmapSetInfo beatmapSet) => storage.Exists(beatmapSet.Path);
-
-        private class DatabaseWorkingBeatmap : WorkingBeatmap
-        {
-            private readonly BeatmapDatabase database;
-
-            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
-                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
-            {
-                this.database = database;
-            }
-
-            protected override ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
-        }
     }
 }
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
new file mode 100644
index 0000000000..1584b9137b
--- /dev/null
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -0,0 +1,127 @@
+using System.IO;
+using osu.Framework.Audio.Track;
+using osu.Framework.Graphics.Textures;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.Formats;
+using osu.Game.Beatmaps.IO;
+
+namespace osu.Game.Database
+{
+    public partial class BeatmapDatabase
+    {
+        private class DatabaseWorkingBeatmap : WorkingBeatmap
+        {
+            private readonly BeatmapDatabase database;
+
+            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
+                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
+            {
+                this.database = database;
+            }
+
+            private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
+
+            private Beatmap beatmap;
+            private object beatmapLock = new object();
+            public override Beatmap Beatmap
+            {
+                get
+                {
+                    lock (beatmapLock)
+                    {
+                        if (beatmap != null) return beatmap;
+    
+                        try
+                        {
+                            using (var reader = GetReader())
+                            {
+                                BeatmapDecoder decoder;
+                                using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
+                                {
+                                    decoder = BeatmapDecoder.GetDecoder(stream);
+                                    beatmap = decoder?.Decode(stream);
+                                }
+    
+                                if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                                    using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                                        decoder?.Decode(stream, beatmap);
+                            }
+                        }
+                        catch { return null; }
+    
+                        return beatmap;
+                    }
+                }
+            }
+
+            private object backgroundLock = new object();
+            private Texture background;
+            public override Texture Background
+            {
+                get
+                {
+                    lock (backgroundLock)
+                    {
+                        if (background != null) return background;
+    
+                        if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
+    
+                        try
+                        {
+                            using (var reader = GetReader())
+                            {
+                                background = new TextureStore(
+                                    new RawTextureLoaderStore(reader),
+                                    false).Get(BeatmapInfo.Metadata.BackgroundFile);
+                            }
+                        }
+                        catch { return null; }
+    
+                        return background;
+                    }
+                }
+            }
+
+            private ArchiveReader trackReader;
+            private Track track;
+            private object trackLock = new object();
+            public override Track Track
+            {
+                get
+                {
+                    lock (trackLock)
+                    {
+                        if (track != null) return track;
+    
+                        try
+                        {
+                            //store a reference to the reader as we may continue accessing the stream in the background.
+                            trackReader = GetReader();
+                            var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                            if (trackData != null)
+                                track = new TrackBass(trackData);
+                        }
+                        catch { return null; }
+    
+                        return track;
+                    }
+                }
+            }
+            
+            public override bool TrackLoaded => track != null;
+
+            public override void TransferTo(WorkingBeatmap other)
+            {
+                var _other = (DatabaseWorkingBeatmap)other;
+                if (track != null && BeatmapInfo.AudioEquals(_other.BeatmapInfo))
+                    _other.track = track;
+            }
+            
+            public override void Dispose()
+            {
+                background?.Dispose();
+                background = null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 9cedaa1b09..5b31962f21 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -363,6 +363,7 @@
     <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
     <Compile Include="Graphics\UserInterface\OsuTabControl.cs" />
     <Compile Include="Graphics\UserInterface\OsuTabItem.cs" />
+    <Compile Include="Database\DatabaseWorkingBeatmap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">

From 267238dc270cbc01b47545f34e594fe728e59471 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 06:15:32 -0400
Subject: [PATCH 08/21] Simplify derived classes of WorkingBeatmap

---
 .../Beatmaps/TestWorkingBeatmap.cs            |  46 +++----
 osu.Game/Beatmaps/WorkingBeatmap.cs           |  62 ++++++++-
 osu.Game/Database/DatabaseWorkingBeatmap.cs   | 123 ++++++------------
 3 files changed, 116 insertions(+), 115 deletions(-)

diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
index e6236b041f..0db9991cb8 100644
--- a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -1,32 +1,26 @@
-using System;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.IO;
 
-namespace osu.Desktop.VisualTests.Beatmaps
-{
-    public class TestWorkingBeatmap : WorkingBeatmap
-    {
-        public TestWorkingBeatmap(Beatmap beatmap)
-            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
-        {
-            this.beatmap = beatmap;
+namespace osu.Desktop.VisualTests.Beatmaps
+{
+    public class TestWorkingBeatmap : WorkingBeatmap
+    {
+        public TestWorkingBeatmap(Beatmap beatmap)
+            : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet)
+        {
+            this.beatmap = beatmap;
         }
-
-        private Beatmap beatmap;
-        public override Beatmap Beatmap => beatmap;
-        public override Texture Background => null;
-        public override Track Track => null;
-        
-        public override void Dispose()
-        {
-            // This space intentionally left blank
-        }
-        
-        public override void TransferTo(WorkingBeatmap other)
-        {
-            // This space intentionally left blank
-        }
-    }
-}
+
+        private Beatmap beatmap;
+        
+        protected override Beatmap GetBeatmap() => beatmap;
+        protected override Texture GetBackground() => null;
+        protected override Track GetTrack() => null;
+    }
+}
diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs
index 3be2a40bb0..2a2de1b6ef 100644
--- a/osu.Game/Beatmaps/WorkingBeatmap.cs
+++ b/osu.Game/Beatmaps/WorkingBeatmap.cs
@@ -36,14 +36,64 @@ namespace osu.Game.Beatmaps
             BeatmapSetInfo = beatmapSetInfo;
             WithStoryboard = withStoryboard;
         }
+
+        protected abstract Beatmap GetBeatmap();
+        protected abstract Texture GetBackground();
+        protected abstract Track GetTrack();
         
-        public abstract Beatmap Beatmap { get; }
-        public abstract Texture Background { get; }
-        public abstract Track Track { get; }
+        private Beatmap beatmap;
+        private object beatmapLock = new object();
+        public Beatmap Beatmap
+        {
+            get
+            {
+                lock (beatmapLock)
+                {
+                    return beatmap ?? (beatmap = GetBeatmap());
+                }
+            }
+        }
+        
+        private object backgroundLock = new object();
+        private Texture background;
+        public Texture Background
+        {
+            get
+            {
+                lock (backgroundLock)
+                {
+                    return background ?? (background = GetBackground());
+                }
+            }
+        }
 
-        public abstract void TransferTo(WorkingBeatmap other);
-        public abstract void Dispose();
+        private Track track;
+        private object trackLock = new object();
+        public Track Track
+        {
+            get
+            {
+                lock (trackLock)
+                {
+                    return track ?? (track = GetTrack());
+                }
+            }
+        }
 
-        public virtual bool TrackLoaded => Track != null;
+        public bool TrackLoaded => track != null;
+
+        public void TransferTo(WorkingBeatmap other)
+        {
+            if (track != null && BeatmapInfo.AudioEquals(other.BeatmapInfo))
+                other.track = track;
+        }
+        
+        public virtual void Dispose()
+        {
+            track?.Dispose();
+            track = null;
+            background?.Dispose();
+            background = null;
+        }
     }
 }
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 1584b9137b..56b4a81980 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -1,4 +1,7 @@
-using System.IO;
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.IO;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
@@ -20,107 +23,61 @@ namespace osu.Game.Database
             }
 
             private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
-
-            private Beatmap beatmap;
-            private object beatmapLock = new object();
-            public override Beatmap Beatmap
+            
+            protected override Beatmap GetBeatmap()
             {
-                get
+                Beatmap beatmap;
+                try
                 {
-                    lock (beatmapLock)
+                    using (var reader = GetReader())
                     {
-                        if (beatmap != null) return beatmap;
-    
-                        try
+                        BeatmapDecoder decoder;
+                        using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
                         {
-                            using (var reader = GetReader())
-                            {
-                                BeatmapDecoder decoder;
-                                using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                                {
-                                    decoder = BeatmapDecoder.GetDecoder(stream);
-                                    beatmap = decoder?.Decode(stream);
-                                }
-    
-                                if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                                    using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                        decoder?.Decode(stream, beatmap);
-                            }
+                            decoder = BeatmapDecoder.GetDecoder(stream);
+                            beatmap = decoder?.Decode(stream);
                         }
-                        catch { return null; }
-    
-                        return beatmap;
+
+                        if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                            using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                                decoder?.Decode(stream, beatmap);
                     }
                 }
+                catch { return null; }
+                return beatmap;
             }
-
-            private object backgroundLock = new object();
-            private Texture background;
-            public override Texture Background
+            
+            protected override Texture GetBackground()
             {
-                get
+                Texture background;
+                if (BeatmapInfo?.Metadata?.BackgroundFile == null)
+                    return null;
+                try
                 {
-                    lock (backgroundLock)
+                    using (var reader = GetReader())
                     {
-                        if (background != null) return background;
-    
-                        if (BeatmapInfo?.Metadata?.BackgroundFile == null) return null;
-    
-                        try
-                        {
-                            using (var reader = GetReader())
-                            {
-                                background = new TextureStore(
-                                    new RawTextureLoaderStore(reader),
-                                    false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                            }
-                        }
-                        catch { return null; }
-    
-                        return background;
+                        background = new TextureStore(
+                            new RawTextureLoaderStore(reader),
+                            false).Get(BeatmapInfo.Metadata.BackgroundFile);
                     }
                 }
+                catch { return null; }
+                return background;
             }
 
             private ArchiveReader trackReader;
-            private Track track;
-            private object trackLock = new object();
-            public override Track Track
+            protected override Track GetTrack()
             {
-                get
+                Track track;
+                try
                 {
-                    lock (trackLock)
-                    {
-                        if (track != null) return track;
-    
-                        try
-                        {
-                            //store a reference to the reader as we may continue accessing the stream in the background.
-                            trackReader = GetReader();
-                            var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                            if (trackData != null)
-                                track = new TrackBass(trackData);
-                        }
-                        catch { return null; }
-    
-                        return track;
-                    }
+                    //store a reference to the reader as we may continue accessing the stream in the background.
+                    trackReader = GetReader();
+                    var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                    track = trackData == null ? null : new TrackBass(trackData);
                 }
-            }
-            
-            public override bool TrackLoaded => track != null;
-
-            public override void TransferTo(WorkingBeatmap other)
-            {
-                var _other = (DatabaseWorkingBeatmap)other;
-                if (track != null && BeatmapInfo.AudioEquals(_other.BeatmapInfo))
-                    _other.track = track;
-            }
-            
-            public override void Dispose()
-            {
-                background?.Dispose();
-                background = null;
+                catch { return null; }
+                return track;
             }
         }
     }

From 2b1d31e69c222afd25335dcd27b86fec050e6de0 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 06:25:49 -0400
Subject: [PATCH 09/21] Address linting issues

---
 osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs |  2 --
 osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs     |  2 --
 osu.Desktop.VisualTests/Tests/TestCasePlayer.cs        |  2 --
 osu.Game/Database/DatabaseWorkingBeatmap.cs            | 10 +++++-----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
index 0db9991cb8..babca8ee06 100644
--- a/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
+++ b/osu.Desktop.VisualTests/Beatmaps/TestWorkingBeatmap.cs
@@ -1,11 +1,9 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using System;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.IO;
 
 namespace osu.Desktop.VisualTests.Beatmaps
 {
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
index 6de2b36cd0..e876c21a12 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
@@ -8,7 +8,6 @@ using osu.Framework.MathUtils;
 using osu.Framework.Screens.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes.Catch.UI;
 using osu.Game.Modes.Mania.UI;
@@ -17,7 +16,6 @@ using osu.Game.Modes.Osu.Objects;
 using osu.Game.Modes.Osu.UI;
 using osu.Game.Modes.Taiko.UI;
 using System.Collections.Generic;
-using osu.Framework.Graphics.Textures;
 using osu.Desktop.VisualTests.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
diff --git a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
index 21a00ebdf6..a08cb3e97e 100644
--- a/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Screens.Testing;
 using osu.Game.Beatmaps;
 using OpenTK;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Beatmaps.IO;
 using osu.Game.Database;
 using osu.Game.Modes;
 using osu.Game.Modes.Objects;
@@ -24,7 +23,6 @@ namespace osu.Desktop.VisualTests.Tests
         protected Player Player;
         private BeatmapDatabase db;
 
-
         public override string Description => @"Showing everything to play the game.";
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 56b4a81980..0961d95f03 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -22,14 +22,14 @@ namespace osu.Game.Database
                 this.database = database;
             }
 
-            private ArchiveReader GetReader() => database?.GetReader(BeatmapSetInfo);
+            private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
             
             protected override Beatmap GetBeatmap()
             {
                 Beatmap beatmap;
                 try
                 {
-                    using (var reader = GetReader())
+                    using (var reader = getReader())
                     {
                         BeatmapDecoder decoder;
                         using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
@@ -40,7 +40,7 @@ namespace osu.Game.Database
 
                         if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
                             using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                decoder?.Decode(stream, beatmap);
+                                decoder.Decode(stream, beatmap);
                     }
                 }
                 catch { return null; }
@@ -54,7 +54,7 @@ namespace osu.Game.Database
                     return null;
                 try
                 {
-                    using (var reader = GetReader())
+                    using (var reader = getReader())
                     {
                         background = new TextureStore(
                             new RawTextureLoaderStore(reader),
@@ -72,7 +72,7 @@ namespace osu.Game.Database
                 try
                 {
                     //store a reference to the reader as we may continue accessing the stream in the background.
-                    trackReader = GetReader();
+                    trackReader = getReader();
                     var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
                     track = trackData == null ? null : new TrackBass(trackData);
                 }

From fbe08436d2dbe9aac1639d9037e08ac7eec7e57b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 15:27:22 +0900
Subject: [PATCH 10/21] Fix usages of CircularContainer in line with framework
 changes.

---
 osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs | 2 ++
 osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs | 1 +
 osu.Game/Graphics/UserInterface/Nub.cs                     | 2 ++
 osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs      | 2 ++
 osu.Game/Overlays/Dialog/PopupDialog.cs                    | 1 +
 osu.Game/Screens/Menu/OsuLogo.cs                           | 2 ++
 6 files changed, 10 insertions(+)

diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
index 8d8aadbb60..750f203a8d 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
@@ -29,6 +29,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
             {
                 new CircularContainer
                 {
+                    Masking = true,
+                    Origin = Anchor.Centre,
                     EdgeEffect = new EdgeEffect
                     {
                         Type = EdgeEffectType.Glow,
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 906a3cd7c3..58745dec84 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -61,6 +61,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
                     {
                         Colour = Color4.White,
                         RelativePositionAxes = Axes.Both,
+                        Masking = true,
                         Origin = Anchor.Centre,
                         Size = new Vector2(1 / ScreenSpaceDrawQuad.Width * 2000),
                         Children = new[]
diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs
index 6f3529b67d..a32e047af9 100644
--- a/osu.Game/Graphics/UserInterface/Nub.cs
+++ b/osu.Game/Graphics/UserInterface/Nub.cs
@@ -30,6 +30,8 @@ namespace osu.Game.Graphics.UserInterface
             BorderColour = Color4.White;
             BorderThickness = border_width;
 
+            Masking = true;
+
             Children = new[]
             {
                 fill = new Box
diff --git a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
index df48694249..c9d8f936f6 100644
--- a/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
@@ -28,6 +28,8 @@ namespace osu.Game.Graphics.UserInterface
                     circle = new CircularContainer
                     {
                         Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Masking = true,
                         Alpha = 0,
                         RelativeSizeAxes = Axes.Both,
                         Size = new Vector2(0.8f, 0),
diff --git a/osu.Game/Overlays/Dialog/PopupDialog.cs b/osu.Game/Overlays/Dialog/PopupDialog.cs
index 908dbf8ebc..7936339e0c 100644
--- a/osu.Game/Overlays/Dialog/PopupDialog.cs
+++ b/osu.Game/Overlays/Dialog/PopupDialog.cs
@@ -193,6 +193,7 @@ namespace osu.Game.Overlays.Dialog
                                         {
                                             Origin = Anchor.Centre,
                                             Anchor = Anchor.Centre,
+                                            Masking = true,
                                             BorderColour = Color4.White,
                                             BorderThickness = 5f,
                                             Children = new Drawable[]
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index 259e98c483..90223616d0 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -91,8 +91,10 @@ namespace osu.Game.Screens.Menu
                                         logoContainer = new CircularContainer
                                         {
                                             Anchor = Anchor.Centre,
+                                            Origin = Anchor.Centre,
                                             RelativeSizeAxes = Axes.Both,
                                             Scale = new Vector2(0.8f),
+                                            Masking = true,
                                             Children = new Drawable[]
                                             {
                                                 colourAndTriangles = new Container

From 2e1f596b2ad0974665c0f53301cf3a2540097ec5 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 22 Mar 2017 06:50:48 -0400
Subject: [PATCH 11/21] Move DatabaseWorkingBeatmap out of partial class

---
 osu.Game/Database/BeatmapDatabase.cs        |   2 +-
 osu.Game/Database/DatabaseWorkingBeatmap.cs | 115 ++++++++++----------
 2 files changed, 57 insertions(+), 60 deletions(-)

diff --git a/osu.Game/Database/BeatmapDatabase.cs b/osu.Game/Database/BeatmapDatabase.cs
index b115b86547..317467d792 100644
--- a/osu.Game/Database/BeatmapDatabase.cs
+++ b/osu.Game/Database/BeatmapDatabase.cs
@@ -18,7 +18,7 @@ using SQLiteNetExtensions.Extensions;
 
 namespace osu.Game.Database
 {
-    public partial class BeatmapDatabase
+    public class BeatmapDatabase
     {
         private SQLiteConnection connection { get; }
         private Storage storage;
diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 0961d95f03..0a7779f17b 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -10,75 +10,72 @@ using osu.Game.Beatmaps.IO;
 
 namespace osu.Game.Database
 {
-    public partial class BeatmapDatabase
+    internal class DatabaseWorkingBeatmap : WorkingBeatmap
     {
-        private class DatabaseWorkingBeatmap : WorkingBeatmap
+        private readonly BeatmapDatabase database;
+
+        public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
+            : base(beatmapInfo, beatmapSetInfo, withStoryboard)
         {
-            private readonly BeatmapDatabase database;
+            this.database = database;
+        }
 
-            public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo, BeatmapSetInfo beatmapSetInfo, bool withStoryboard = false)
-                : base(beatmapInfo, beatmapSetInfo, withStoryboard)
+        private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
+        
+        protected override Beatmap GetBeatmap()
+        {
+            Beatmap beatmap;
+            try
             {
-                this.database = database;
-            }
-
-            private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
-            
-            protected override Beatmap GetBeatmap()
-            {
-                Beatmap beatmap;
-                try
+                using (var reader = getReader())
                 {
-                    using (var reader = getReader())
+                    BeatmapDecoder decoder;
+                    using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
                     {
-                        BeatmapDecoder decoder;
-                        using (var stream = new StreamReader(reader.GetStream(BeatmapInfo.Path)))
-                        {
-                            decoder = BeatmapDecoder.GetDecoder(stream);
-                            beatmap = decoder?.Decode(stream);
-                        }
-
-                        if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
-                            using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
-                                decoder.Decode(stream, beatmap);
+                        decoder = BeatmapDecoder.GetDecoder(stream);
+                        beatmap = decoder?.Decode(stream);
                     }
-                }
-                catch { return null; }
-                return beatmap;
-            }
-            
-            protected override Texture GetBackground()
-            {
-                Texture background;
-                if (BeatmapInfo?.Metadata?.BackgroundFile == null)
-                    return null;
-                try
-                {
-                    using (var reader = getReader())
-                    {
-                        background = new TextureStore(
-                            new RawTextureLoaderStore(reader),
-                            false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                    }
-                }
-                catch { return null; }
-                return background;
-            }
 
-            private ArchiveReader trackReader;
-            protected override Track GetTrack()
-            {
-                Track track;
-                try
-                {
-                    //store a reference to the reader as we may continue accessing the stream in the background.
-                    trackReader = getReader();
-                    var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                    track = trackData == null ? null : new TrackBass(trackData);
+                    if (WithStoryboard && beatmap != null && BeatmapSetInfo.StoryboardFile != null)
+                        using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
+                            decoder.Decode(stream, beatmap);
                 }
-                catch { return null; }
-                return track;
             }
+            catch { return null; }
+            return beatmap;
+        }
+        
+        protected override Texture GetBackground()
+        {
+            Texture background;
+            if (BeatmapInfo?.Metadata?.BackgroundFile == null)
+                return null;
+            try
+            {
+                using (var reader = getReader())
+                {
+                    background = new TextureStore(
+                        new RawTextureLoaderStore(reader),
+                        false).Get(BeatmapInfo.Metadata.BackgroundFile);
+                }
+            }
+            catch { return null; }
+            return background;
+        }
+
+        private ArchiveReader trackReader;
+        protected override Track GetTrack()
+        {
+            Track track;
+            try
+            {
+                //store a reference to the reader as we may continue accessing the stream in the background.
+                trackReader = getReader();
+                var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                track = trackData == null ? null : new TrackBass(trackData);
+            }
+            catch { return null; }
+            return track;
         }
     }
 }
\ No newline at end of file

From 1c83442b0b1cc7ea8fe0315567f8f7d2e9989536 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 22 Mar 2017 21:36:03 +0900
Subject: [PATCH 12/21] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 24fc560d01..31cf1c4b58 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 24fc560d01ba16d86a1c429817ec3b71d146e698
+Subproject commit 31cf1c4b58c866d047876b15a95a4cf0115d3105

From 086191a12a8cc15a248d566bc7b8023e2d41924e Mon Sep 17 00:00:00 2001
From: Andrey Zavadskiy <megaman9919@gmail.com>
Date: Wed, 22 Mar 2017 16:13:39 +0300
Subject: [PATCH 13/21] Spinner fix

---
 osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 58745dec84..a4fce3deb5 100644
--- a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
         private void load(OsuColour colours)
         {
             completeColour = colours.YellowLight.Opacity(0.8f);
+            Masking = true;
         }
 
         private class SpinnerBorder : Container

From 2d75c604636e97d5588e6a03dce592f4f1aa3723 Mon Sep 17 00:00:00 2001
From: Andrey Zavadskiy <megaman9919@gmail.com>
Date: Wed, 22 Mar 2017 17:21:24 +0300
Subject: [PATCH 14/21] Fix checkbox dependency in LoginOptions

---
 osu.Game/Configuration/OsuConfigManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 1442a26a06..6190678e1e 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -176,11 +176,11 @@ namespace osu.Game.Configuration
                 ConfineMouseMode.Fullscreen : ConfineMouseMode.Never).Disabled = true;
 
 
-            GetBindable<bool>(OsuConfig.SavePassword).ValueChanged += delegate
+            GetOriginalBindable<bool>(OsuConfig.SavePassword).ValueChanged += delegate
             {
                 if (Get<bool>(OsuConfig.SavePassword)) Set(OsuConfig.SaveUsername, true);
             };
-            GetBindable<bool>(OsuConfig.SaveUsername).ValueChanged += delegate
+            GetOriginalBindable<bool>(OsuConfig.SaveUsername).ValueChanged += delegate
             {
                 if (!Get<bool>(OsuConfig.SaveUsername)) Set(OsuConfig.SavePassword, false);
             };

From 0dbc232ebf96c8f425b90d4c445909a04df9b758 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 22:32:32 +0800
Subject: [PATCH 15/21] Rename all DropDown -> Dropdown.

---
 .../{OsuDropDown.cs => OsuDropdown.cs}        | 10 +++----
 ...DropDownHeader.cs => OsuDropdownHeader.cs} |  4 +--
 ...DownMenuItem.cs => OsuDropdownMenuItem.cs} |  4 +--
 .../Graphics/UserInterface/OsuTabControl.cs   | 26 +++++++++----------
 .../{OptionDropDown.cs => OptionDropdown.cs}  |  8 +++---
 ...nEnumDropDown.cs => OptionEnumDropdown.cs} |  4 +--
 .../Sections/Audio/AudioDevicesOptions.cs     |  4 +--
 .../Options/Sections/Debug/GCOptions.cs       |  2 +-
 .../Sections/Gameplay/GeneralOptions.cs       |  4 +--
 .../Options/Sections/General/UpdateOptions.cs |  2 +-
 .../Sections/Graphics/DetailOptions.cs        |  2 +-
 .../Sections/Graphics/LayoutOptions.cs        |  2 +-
 .../Sections/Graphics/RendererOptions.cs      |  2 +-
 .../Options/Sections/Input/MouseOptions.cs    |  2 +-
 osu.Game/osu.Game.csproj                      |  6 ++---
 15 files changed, 41 insertions(+), 41 deletions(-)
 rename osu.Game/Graphics/UserInterface/{OsuDropDown.cs => OsuDropdown.cs} (67%)
 rename osu.Game/Graphics/UserInterface/{OsuDropDownHeader.cs => OsuDropdownHeader.cs} (92%)
 rename osu.Game/Graphics/UserInterface/{OsuDropDownMenuItem.cs => OsuDropdownMenuItem.cs} (92%)
 rename osu.Game/Overlays/Options/{OptionDropDown.cs => OptionDropdown.cs} (88%)
 rename osu.Game/Overlays/Options/{OptionEnumDropDown.cs => OptionEnumDropdown.cs} (89%)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropDown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
similarity index 67%
rename from osu.Game/Graphics/UserInterface/OsuDropDown.cs
rename to osu.Game/Graphics/UserInterface/OsuDropdown.cs
index a921be1a1d..d8d4a93091 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -8,9 +8,9 @@ using osu.Framework.Graphics.UserInterface;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class OsuDropDown<T> : DropDown<T>
+    public class OsuDropdown<T> : Dropdown<T>
     {
-        protected override DropDownHeader CreateHeader() => new OsuDropDownHeader { AccentColour = AccentColour };
+        protected override DropdownHeader CreateHeader() => new OsuDropdownHeader { AccentColour = AccentColour };
 
         protected override Menu CreateMenu() => new OsuMenu();
 
@@ -22,8 +22,8 @@ namespace osu.Game.Graphics.UserInterface
             {
                 accentColour = value;
                 if (Header != null)
-                    ((OsuDropDownHeader)Header).AccentColour = value;
-                foreach (var item in MenuItems.OfType<OsuDropDownMenuItem<T>>())
+                    ((OsuDropdownHeader)Header).AccentColour = value;
+                foreach (var item in MenuItems.OfType<OsuDropdownMenuItem<T>>())
                     item.AccentColour = value;
             }
         }
@@ -35,6 +35,6 @@ namespace osu.Game.Graphics.UserInterface
                 AccentColour = colours.PinkDarker;
         }
 
-        protected override DropDownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropDownMenuItem<T>(text, value) { AccentColour = AccentColour };
+        protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem<T>(text, value) { AccentColour = AccentColour };
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs b/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
similarity index 92%
rename from osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs
rename to osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
index 559ffca283..8bef24a6f8 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDownHeader.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
@@ -12,7 +12,7 @@ using osu.Framework.Extensions.Color4Extensions;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class OsuDropDownHeader : DropDownHeader
+    public class OsuDropdownHeader : DropdownHeader
     {
         private SpriteText label;
         protected override string Label
@@ -32,7 +32,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public OsuDropDownHeader()
+        public OsuDropdownHeader()
         {
             Foreground.Padding = new MarginPadding(4);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
similarity index 92%
rename from osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
rename to osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
index 71650dee52..bcd53a8dbd 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropDownMenuItem.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
@@ -12,9 +12,9 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Graphics.UserInterface
 {
-    public class OsuDropDownMenuItem<U> : DropDownMenuItem<U>
+    public class OsuDropdownMenuItem<T> : DropdownMenuItem<T>
     {
-        public OsuDropDownMenuItem(string text, U value) : base(text, value)
+        public OsuDropdownMenuItem(string text, T value) : base(text, value)
         {
             Foreground.Padding = new MarginPadding(2);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 84f3125ca4..8a22347c76 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -16,11 +16,11 @@ namespace osu.Game.Graphics.UserInterface
 {
     public class OsuTabControl<T> : TabControl<T>
     {
-        protected override DropDown<T> CreateDropDown() => new OsuTabDropDown();
+        protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown();
 
         protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
 
-        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || DropDown.Contains(screenSpacePos);
+        protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
 
         public OsuTabControl()
         {
@@ -45,7 +45,7 @@ namespace osu.Game.Graphics.UserInterface
             set
             {
                 accentColour = value;
-                var dropDown = DropDown as OsuTabDropDown;
+                var dropDown = Dropdown as OsuTabDropdown;
                 if (dropDown != null)
                     dropDown.AccentColour = value;
                 foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
@@ -53,34 +53,34 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public class OsuTabDropDown : OsuDropDown<T>
+        public class OsuTabDropdown : OsuDropdown<T>
         {
-            protected override DropDownHeader CreateHeader() => new OsuTabDropDownHeader
+            protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
             {
                 AccentColour = AccentColour,
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
             };
 
-            protected override DropDownMenuItem<T> CreateMenuItem(string text, T value)
+            protected override DropdownMenuItem<T> CreateMenuItem(string text, T value)
             {
                 var item = base.CreateMenuItem(text, value);
                 item.ForegroundColourHover = Color4.Black;
                 return item;
             }
 
-            public OsuTabDropDown()
+            public OsuTabDropdown()
             {
-                DropDownMenu.Anchor = Anchor.TopRight;
-                DropDownMenu.Origin = Anchor.TopRight;
+                DropdownMenu.Anchor = Anchor.TopRight;
+                DropdownMenu.Origin = Anchor.TopRight;
 
                 RelativeSizeAxes = Axes.X;
 
-                DropDownMenu.Background.Colour = Color4.Black.Opacity(0.7f);
-                DropDownMenu.MaxHeight = 400;
+                DropdownMenu.Background.Colour = Color4.Black.Opacity(0.7f);
+                DropdownMenu.MaxHeight = 400;
             }
 
-            public class OsuTabDropDownHeader : OsuDropDownHeader
+            public class OsuTabDropdownHeader : OsuDropdownHeader
             {
                 public override Color4 AccentColour
                 {
@@ -104,7 +104,7 @@ namespace osu.Game.Graphics.UserInterface
                     base.OnHoverLost(state);
                 }
 
-                public OsuTabDropDownHeader()
+                public OsuTabDropdownHeader()
                 {
                     RelativeSizeAxes = Axes.None;
                     AutoSizeAxes = Axes.X;
diff --git a/osu.Game/Overlays/Options/OptionDropDown.cs b/osu.Game/Overlays/Options/OptionDropdown.cs
similarity index 88%
rename from osu.Game/Overlays/Options/OptionDropDown.cs
rename to osu.Game/Overlays/Options/OptionDropdown.cs
index 9c9cd17b12..d46e786bca 100644
--- a/osu.Game/Overlays/Options/OptionDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionDropdown.cs
@@ -13,9 +13,9 @@ using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionDropDown<T> : FillFlowContainer
+    public class OptionDropdown<T> : FillFlowContainer
     {
-        private DropDown<T> dropdown;
+        private Dropdown<T> dropdown;
         private SpriteText text;
 
         public string LabelText
@@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Options
             }
         }
 
-        public OptionDropDown()
+        public OptionDropdown()
         {
             Items = new KeyValuePair<string, T>[0];
 
@@ -68,7 +68,7 @@ namespace osu.Game.Overlays.Options
                 text = new OsuSpriteText {
                     Alpha = 0,
                 },
-                dropdown = new OsuDropDown<T>
+                dropdown = new OsuDropdown<T>
                 {
                     Margin = new MarginPadding { Top = 5 },
                     RelativeSizeAxes = Axes.X,
diff --git a/osu.Game/Overlays/Options/OptionEnumDropDown.cs b/osu.Game/Overlays/Options/OptionEnumDropdown.cs
similarity index 89%
rename from osu.Game/Overlays/Options/OptionEnumDropDown.cs
rename to osu.Game/Overlays/Options/OptionEnumDropdown.cs
index 50d1d36b4c..1a4f4635e2 100644
--- a/osu.Game/Overlays/Options/OptionEnumDropDown.cs
+++ b/osu.Game/Overlays/Options/OptionEnumDropdown.cs
@@ -8,9 +8,9 @@ using System.Collections.Generic;
 
 namespace osu.Game.Overlays.Options
 {
-    public class OptionEnumDropDown<T> : OptionDropDown<T>
+    public class OptionEnumDropdown<T> : OptionDropdown<T>
     {
-        public OptionEnumDropDown()
+        public OptionEnumDropdown()
         {
             if (!typeof(T).IsEnum)
                 throw new InvalidOperationException("OptionsDropdown only supports enums as the generic type argument");
diff --git a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
index 25585845b0..2818f5fbd7 100644
--- a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Overlays.Options.Sections.Audio
         protected override string Header => "Devices";
 
         private AudioManager audio;
-        private OptionDropDown<string> dropdown;
+        private OptionDropdown<string> dropdown;
 
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.Options.Sections.Audio
 
             Children = new Drawable[]
             {
-                dropdown = new OptionDropDown<string>
+                dropdown = new OptionDropdown<string>
                 {
                     Bindable = audio.AudioDevice
                 },
diff --git a/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs b/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
index ada57e8dd0..4350625d51 100644
--- a/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Debug/GCOptions.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Options.Sections.Debug
         {
             Children = new Drawable[]
             {
-                new OptionEnumDropDown<GCLatencyMode>
+                new OptionEnumDropdown<GCLatencyMode>
                 {
                     LabelText = "Active mode",
                     Bindable = config.GetBindable<GCLatencyMode>(FrameworkDebugConfig.ActiveGCMode)
diff --git a/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs b/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
index 1c28f6247d..70a2c52322 100644
--- a/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
@@ -23,12 +23,12 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay
                     LabelText = "Background dim",
                     Bindable = (BindableInt)config.GetBindable<int>(OsuConfig.DimLevel)
                 },
-                new OptionEnumDropDown<ProgressBarType>
+                new OptionEnumDropdown<ProgressBarType>
                 {
                     LabelText = "Progress display",
                     Bindable = config.GetBindable<ProgressBarType>(OsuConfig.ProgressBarType)
                 },
-                new OptionEnumDropDown<ScoreMeterType>
+                new OptionEnumDropdown<ScoreMeterType>
                 {
                     LabelText = "Score meter type",
                     Bindable = config.GetBindable<ScoreMeterType>(OsuConfig.ScoreMeter)
diff --git a/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs b/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs
index c45dc9cbd4..2b2939e432 100644
--- a/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/General/UpdateOptions.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Options.Sections.General
         {
             Children = new Drawable[]
             {
-                new OptionEnumDropDown<ReleaseStream>
+                new OptionEnumDropdown<ReleaseStream>
                 {
                     LabelText = "Release stream",
                     Bindable = config.GetBindable<ReleaseStream>(OsuConfig.ReleaseStream),
diff --git a/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs
index e66d097094..0af8a4c580 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/DetailOptions.cs
+++ b/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 OptionEnumDropDown<ScreenshotFormat>
+                new OptionEnumDropdown<ScreenshotFormat>
                 {
                     LabelText = "Screenshot",
                     Bindable = config.GetBindable<ScreenshotFormat>(OsuConfig.ScreenshotFormat)
diff --git a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
index 0a2e8f91a4..8c4930d99d 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
+++ b/osu.Game/Overlays/Options/Sections/Graphics/LayoutOptions.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
             Children = new Drawable[]
             {
                 new OptionLabel { Text = "Resolution: TODO dropdown" },
-                new OptionEnumDropDown<WindowMode>
+                new OptionEnumDropdown<WindowMode>
                 {
                     LabelText = "Screen mode",
                     Bindable = config.GetBindable<WindowMode>(FrameworkConfig.WindowMode),
diff --git a/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs b/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs
index b98337f1e6..c898879167 100644
--- a/osu.Game/Overlays/Options/Sections/Graphics/RendererOptions.cs
+++ b/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 OptionEnumDropDown<FrameSync>
+                new OptionEnumDropdown<FrameSync>
                 {
                     LabelText = "Frame limiter",
                     Bindable = config.GetBindable<FrameSync>(FrameworkConfig.FrameSync)
diff --git a/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs b/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
index ef1dd755b7..92be00bdb0 100644
--- a/osu.Game/Overlays/Options/Sections/Input/MouseOptions.cs
+++ b/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 OptionEnumDropDown<ConfineMouseMode>
+                new OptionEnumDropdown<ConfineMouseMode>
                 {
                     LabelText = "Confine mouse cursor",
                     Bindable = config.GetBindable<ConfineMouseMode>(OsuConfig.ConfineMouse),
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 39b9d8d9e5..879ca9ddbe 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -161,9 +161,9 @@
     <Compile Include="Overlays\Notifications\SimpleNotification.cs" />
     <Compile Include="Overlays\Options\OptionDropDown.cs" />
     <Compile Include="Overlays\Options\OptionLabel.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDownHeader.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDown.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropDownMenuItem.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropdownHeader.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropdown.cs" />
+    <Compile Include="Graphics\UserInterface\OsuDropdownMenuItem.cs" />
     <Compile Include="Overlays\Options\OptionsFooter.cs" />
     <Compile Include="Overlays\Options\Sections\DebugSection.cs" />
     <Compile Include="Overlays\Options\Sections\Debug\GeneralOptions.cs" />

From 5043032b480f95ac4fbd4ead05873f050f1c8e69 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Wed, 22 Mar 2017 22:56:45 +0800
Subject: [PATCH 16/21] Update framework.

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 31cf1c4b58..42ec8a62fb 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 31cf1c4b58c866d047876b15a95a4cf0115d3105
+Subproject commit 42ec8a62fb697f1d967a927549dc51336cd66968

From 537f0b93407882e6417c4c801e0f9de1602e921e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 08:07:59 +0900
Subject: [PATCH 17/21] Fix menu cursor size not sticking on startup.

Also tidied up bindables.
---
 osu.Game/Graphics/Cursor/GameplayCursor.cs | 5 ++---
 osu.Game/Graphics/Cursor/MenuCursor.cs     | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/Cursor/GameplayCursor.cs b/osu.Game/Graphics/Cursor/GameplayCursor.cs
index 42d7e83750..ed9d52d0b7 100644
--- a/osu.Game/Graphics/Cursor/GameplayCursor.cs
+++ b/osu.Game/Graphics/Cursor/GameplayCursor.cs
@@ -54,8 +54,6 @@ namespace osu.Game.Graphics.Cursor
             [BackgroundDependencyLoader]
             private void load(OsuConfigManager config)
             {
-                cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
-
                 Children = new Drawable[]
                 {
                     cursorContainer = new CircularContainer
@@ -63,7 +61,6 @@ namespace osu.Game.Graphics.Cursor
                         Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
-                        Scale = new Vector2((float)cursorScale),
                         Masking = true,
                         BorderThickness = Size.X / 6,
                         BorderColour = Color4.White,
@@ -119,7 +116,9 @@ namespace osu.Game.Graphics.Cursor
                     },
                 };
 
+                cursorScale = config.GetBindable<double>(OsuConfig.GameplayCursorSize);
                 cursorScale.ValueChanged += scaleChanged;
+                cursorScale.TriggerChange();
             }
 
             private void scaleChanged(object sender, EventArgs e)
diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index 0f90a5aa0e..3ab6fa7093 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -97,8 +97,6 @@ namespace osu.Game.Graphics.Cursor
             [BackgroundDependencyLoader]
             private void load(OsuConfigManager config, TextureStore textures, OsuColour colour)
             {
-                cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
-
                 Children = new Drawable[]
                 {
                     cursorContainer = new Container
@@ -122,7 +120,10 @@ namespace osu.Game.Graphics.Cursor
                         }
                     }
                 };
+
+                cursorScale = config.GetBindable<double>(OsuConfig.MenuCursorSize);
                 cursorScale.ValueChanged += scaleChanged;
+                cursorScale.TriggerChange();
             }
 
             private void scaleChanged(object sender, EventArgs e)

From ba32d50456e2299023b48c34209e53255aaecef1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 08:44:52 +0900
Subject: [PATCH 18/21] Consolidate nested classes.

---
 .../Graphics/UserInterface/OsuDropdown.cs     | 132 ++++++++++++++++++
 .../UserInterface/OsuDropdownHeader.cs        |  69 ---------
 .../UserInterface/OsuDropdownMenuItem.cs      |  85 -----------
 .../Graphics/UserInterface/OsuTabControl.cs   | 112 ++++++++++++++-
 osu.Game/Graphics/UserInterface/OsuTabItem.cs | 121 ----------------
 osu.Game/osu.Game.csproj                      |   3 -
 6 files changed, 242 insertions(+), 280 deletions(-)
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
 delete mode 100644 osu.Game/Graphics/UserInterface/OsuTabItem.cs

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index d8d4a93091..04b7d18de7 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -4,7 +4,13 @@
 using System.Linq;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions.Color4Extensions;
+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.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -36,5 +42,131 @@ namespace osu.Game.Graphics.UserInterface
         }
 
         protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem<T>(text, value) { AccentColour = AccentColour };
+
+        private class OsuDropdownMenuItem<U> : DropdownMenuItem<U>
+        {
+            public OsuDropdownMenuItem(string text, U value) : base(text, value)
+            {
+                Foreground.Padding = new MarginPadding(2);
+
+                Masking = true;
+                CornerRadius = 6;
+
+                Children = new[]
+                {
+                new FillFlowContainer
+                {
+                    Direction = FillDirection.Horizontal,
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y,
+                    Children = new Drawable[]
+                    {
+                        chevron = new TextAwesome
+                        {
+                            AlwaysPresent = true,
+                            Icon = FontAwesome.fa_chevron_right,
+                            UseFullGlyphHeight = false,
+                            Colour = Color4.Black,
+                            Alpha = 0.5f,
+                            TextSize = 8,
+                            Margin = new MarginPadding { Left = 3, Right = 3 },
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                        },
+                        new OsuSpriteText {
+                            Text = text,
+                            Origin = Anchor.CentreLeft,
+                            Anchor = Anchor.CentreLeft,
+                        }
+                    }
+                }
+            };
+            }
+
+            private Color4? accentColour;
+
+            private TextAwesome chevron;
+
+            protected override void FormatForeground(bool hover = false)
+            {
+                base.FormatForeground(hover);
+                chevron.Alpha = hover ? 1 : 0;
+            }
+
+            public Color4 AccentColour
+            {
+                get { return accentColour.GetValueOrDefault(); }
+                set
+                {
+                    accentColour = value;
+                    BackgroundColourHover = BackgroundColourSelected = value;
+                    FormatBackground();
+                    FormatForeground();
+                }
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = Color4.Transparent;
+                BackgroundColourHover = accentColour ?? colours.PinkDarker;
+                BackgroundColourSelected = Color4.Black.Opacity(0.5f);
+            }
+        }
+
+        protected class OsuDropdownHeader : DropdownHeader
+        {
+            private SpriteText label;
+            protected override string Label
+            {
+                get { return label.Text; }
+                set { label.Text = value; }
+            }
+
+            private Color4? accentColour;
+            public virtual Color4 AccentColour
+            {
+                get { return accentColour.GetValueOrDefault(); }
+                set
+                {
+                    accentColour = value;
+                    BackgroundColourHover = value;
+                }
+            }
+
+            public OsuDropdownHeader()
+            {
+                Foreground.Padding = new MarginPadding(4);
+
+                AutoSizeAxes = Axes.None;
+                Margin = new MarginPadding { Bottom = 4 };
+                CornerRadius = 4;
+                Height = 40;
+
+                Foreground.Children = new Drawable[]
+                {
+                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 },
+                    TextSize = 20
+                }
+                };
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = Color4.Black.Opacity(0.5f);
+                BackgroundColourHover = accentColour ?? colours.PinkDarker;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs b/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
deleted file mode 100644
index 8bef24a6f8..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuDropdownHeader.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2007-2017 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.Sprites;
-using OpenTK.Graphics;
-using osu.Framework.Extensions.Color4Extensions;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuDropdownHeader : DropdownHeader
-    {
-        private SpriteText label;
-        protected override string Label
-        {
-            get { return label.Text; }
-            set { label.Text = value; }
-        }
-
-        private Color4? accentColour;
-        public virtual Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                BackgroundColourHover = value;
-            }
-        }
-
-        public OsuDropdownHeader()
-        {
-            Foreground.Padding = new MarginPadding(4);
-
-            AutoSizeAxes = Axes.None;
-            Margin = new MarginPadding { Bottom = 4 };
-            CornerRadius = 4;
-            Height = 40;
-
-            Foreground.Children = new Drawable[]
-            {
-                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 },
-                    TextSize = 20
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            BackgroundColour = Color4.Black.Opacity(0.5f);
-            BackgroundColourHover = accentColour ?? colours.PinkDarker;
-        }
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs b/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
deleted file mode 100644
index bcd53a8dbd..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuDropdownMenuItem.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2007-2017 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.Extensions.Color4Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics.Sprites;
-using OpenTK.Graphics;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuDropdownMenuItem<T> : DropdownMenuItem<T>
-    {
-        public OsuDropdownMenuItem(string text, T value) : base(text, value)
-        {
-            Foreground.Padding = new MarginPadding(2);
-
-            Masking = true;
-            CornerRadius = 6;
-
-            Children = new[]
-            {
-                new FillFlowContainer
-                {
-                    Direction = FillDirection.Horizontal,
-                    RelativeSizeAxes = Axes.X,
-                    AutoSizeAxes = Axes.Y,
-                    Children = new Drawable[]
-                    {
-                        chevron = new TextAwesome
-                        {
-                            AlwaysPresent = true,
-                            Icon = FontAwesome.fa_chevron_right,
-                            UseFullGlyphHeight = false,
-                            Colour = Color4.Black,
-                            Alpha = 0.5f,
-                            TextSize = 8,
-                            Margin = new MarginPadding { Left = 3, Right = 3 },
-                            Origin = Anchor.CentreLeft,
-                            Anchor = Anchor.CentreLeft,
-                        },
-                        new OsuSpriteText {
-                            Text = text,
-                            Origin = Anchor.CentreLeft,
-                            Anchor = Anchor.CentreLeft,
-                        }
-                    }
-                }
-            };
-        }
-
-        private Color4? accentColour;
-
-        private TextAwesome chevron;
-
-        protected override void FormatForeground(bool hover = false)
-        {
-            base.FormatForeground(hover);
-            chevron.Alpha = hover ? 1 : 0;
-        }
-
-        public Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                BackgroundColourHover = BackgroundColourSelected = value;
-                FormatBackground();
-                FormatForeground();
-            }
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            BackgroundColour = Color4.Transparent;
-            BackgroundColourHover = accentColour ?? colours.PinkDarker;
-            BackgroundColourSelected = Color4.Black.Opacity(0.5f);
-        }
-    }
-}
\ No newline at end of file
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 8a22347c76..20f75cf932 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -6,11 +6,15 @@ using System.Linq;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
+using osu.Framework.Extensions;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Primitives;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Graphics.Transforms;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
+using osu.Game.Graphics.Sprites;
 
 namespace osu.Game.Graphics.UserInterface
 {
@@ -53,7 +57,111 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        public class OsuTabDropdown : OsuDropdown<T>
+        private class OsuTabItem<U> : TabItem<U>
+        {
+            private SpriteText text;
+            private Box box;
+
+            private Color4? accentColour;
+            public Color4 AccentColour
+            {
+                get { return accentColour.GetValueOrDefault(); }
+                set
+                {
+                    accentColour = value;
+                    if (!Active)
+                        text.Colour = value;
+                }
+            }
+
+            public new U Value
+            {
+                get { return base.Value; }
+                set
+                {
+                    base.Value = value;
+                    text.Text = (value as Enum)?.GetDescription();
+                }
+            }
+
+            public override bool Active
+            {
+                get { return base.Active; }
+                set
+                {
+                    if (Active == value) return;
+
+                    if (value)
+                        fadeActive();
+                    else
+                        fadeInactive();
+                    base.Active = value;
+                }
+            }
+
+            private const float transition_length = 500;
+
+            private void fadeActive()
+            {
+                box.FadeIn(transition_length, EasingTypes.OutQuint);
+                text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint);
+            }
+
+            private void fadeInactive()
+            {
+                box.FadeOut(transition_length, EasingTypes.OutQuint);
+                text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint);
+            }
+
+            protected override bool OnHover(InputState state)
+            {
+                if (!Active)
+                    fadeActive();
+                return true;
+            }
+
+            protected override void OnHoverLost(InputState state)
+            {
+                if (!Active)
+                    fadeInactive();
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                if (accentColour == null)
+                    AccentColour = colours.Blue;
+            }
+
+            public OsuTabItem()
+            {
+                AutoSizeAxes = Axes.X;
+                RelativeSizeAxes = Axes.Y;
+
+                Children = new Drawable[]
+                {
+                text = new OsuSpriteText
+                {
+                    Margin = new MarginPadding(5),
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                    TextSize = 14,
+                    Font = @"Exo2.0-Bold", // Font should only turn bold when active?
+                },
+                box = new Box
+                {
+                    RelativeSizeAxes = Axes.X,
+                    Height = 1,
+                    Alpha = 0,
+                    Colour = Color4.White,
+                    Origin = Anchor.BottomLeft,
+                    Anchor = Anchor.BottomLeft,
+                }
+                };
+            }
+        }
+
+        private class OsuTabDropdown : OsuDropdown<T>
         {
             protected override DropdownHeader CreateHeader() => new OsuTabDropdownHeader
             {
@@ -80,7 +188,7 @@ namespace osu.Game.Graphics.UserInterface
                 DropdownMenu.MaxHeight = 400;
             }
 
-            public class OsuTabDropdownHeader : OsuDropdownHeader
+            protected class OsuTabDropdownHeader : OsuDropdownHeader
             {
                 public override Color4 AccentColour
                 {
diff --git a/osu.Game/Graphics/UserInterface/OsuTabItem.cs b/osu.Game/Graphics/UserInterface/OsuTabItem.cs
deleted file mode 100644
index acfca1b67b..0000000000
--- a/osu.Game/Graphics/UserInterface/OsuTabItem.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using OpenTK.Graphics;
-using osu.Framework.Allocation;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Primitives;
-using osu.Framework.Graphics.Sprites;
-using osu.Framework.Graphics.Transforms;
-using osu.Framework.Graphics.UserInterface;
-using osu.Framework.Input;
-using osu.Game.Graphics.Sprites;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public class OsuTabItem<T> : TabItem<T>
-    {
-        private SpriteText text;
-        private Box box;
-        
-        private Color4? accentColour;
-        public Color4 AccentColour
-        {
-            get { return accentColour.GetValueOrDefault(); }
-            set
-            {
-                accentColour = value;
-                if (!Active)
-                    text.Colour = value;
-            }
-        }
-
-        public new T Value
-        {
-            get { return base.Value; }
-            set
-            {
-                base.Value = value;
-                text.Text = (value as Enum)?.GetDescription();
-            }
-        }
-
-        public override bool Active
-        {
-            get { return base.Active; }
-            set
-            {
-                if (Active == value) return;
-
-                if (value)
-                    fadeActive();
-                else
-                    fadeInactive();
-                base.Active = value;
-            }
-        }
-
-        private const float transition_length = 500;
-
-        private void fadeActive()
-        {
-            box.FadeIn(transition_length, EasingTypes.OutQuint);
-            text.FadeColour(Color4.White, transition_length, EasingTypes.OutQuint);
-        }
-
-        private void fadeInactive()
-        {
-            box.FadeOut(transition_length, EasingTypes.OutQuint);
-            text.FadeColour(AccentColour, transition_length, EasingTypes.OutQuint);
-        }
-
-        protected override bool OnHover(InputState state)
-        {
-            if (!Active)
-                fadeActive();
-            return true;
-        }
-
-        protected override void OnHoverLost(InputState state)
-        {
-            if (!Active)
-                fadeInactive();
-        }
-
-        public OsuTabItem()
-        {
-            AutoSizeAxes = Axes.X;
-            RelativeSizeAxes = Axes.Y;
-
-            Children = new Drawable[]
-            {
-                text = new OsuSpriteText
-                {
-                    Margin = new MarginPadding(5),
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                    TextSize = 14,
-                    Font = @"Exo2.0-Bold", // Font should only turn bold when active?
-                },
-                box = new Box
-                {
-                    RelativeSizeAxes = Axes.X,
-                    Height = 1,
-                    Alpha = 0,
-                    Colour = Color4.White,
-                    Origin = Anchor.BottomLeft,
-                    Anchor = Anchor.BottomLeft,
-                }
-            };
-        }
-
-        [BackgroundDependencyLoader]
-        private void load(OsuColour colours)
-        {
-            if (accentColour == null)
-                AccentColour = colours.Blue;
-        }
-    }
-}
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 879ca9ddbe..c2bb88d2f8 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -161,9 +161,7 @@
     <Compile Include="Overlays\Notifications\SimpleNotification.cs" />
     <Compile Include="Overlays\Options\OptionDropDown.cs" />
     <Compile Include="Overlays\Options\OptionLabel.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropdownHeader.cs" />
     <Compile Include="Graphics\UserInterface\OsuDropdown.cs" />
-    <Compile Include="Graphics\UserInterface\OsuDropdownMenuItem.cs" />
     <Compile Include="Overlays\Options\OptionsFooter.cs" />
     <Compile Include="Overlays\Options\Sections\DebugSection.cs" />
     <Compile Include="Overlays\Options\Sections\Debug\GeneralOptions.cs" />
@@ -363,7 +361,6 @@
     <Compile Include="Users\Avatar.cs" />
     <Compile Include="Screens\Select\Leaderboards\DrawableRank.cs" />
     <Compile Include="Graphics\UserInterface\OsuTabControl.cs" />
-    <Compile Include="Graphics\UserInterface\OsuTabItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">

From 3dee39346fe61364a5e95910008c5afb0d4ff5e3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 08:49:29 +0900
Subject: [PATCH 19/21] U -> T1.

---
 osu.Game/Graphics/UserInterface/OsuDropdown.cs   | 4 ++--
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 04b7d18de7..20b96a4045 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -43,9 +43,9 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem<T>(text, value) { AccentColour = AccentColour };
 
-        private class OsuDropdownMenuItem<U> : DropdownMenuItem<U>
+        private class OsuDropdownMenuItem<T1> : DropdownMenuItem<T1>
         {
-            public OsuDropdownMenuItem(string text, U value) : base(text, value)
+            public OsuDropdownMenuItem(string text, T1 value) : base(text, value)
             {
                 Foreground.Padding = new MarginPadding(2);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 20f75cf932..2f26a1ca30 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Graphics.UserInterface
             }
         }
 
-        private class OsuTabItem<U> : TabItem<U>
+        private class OsuTabItem<T1> : TabItem<T1>
         {
             private SpriteText text;
             private Box box;
@@ -74,7 +74,7 @@ namespace osu.Game.Graphics.UserInterface
                 }
             }
 
-            public new U Value
+            public new T1 Value
             {
                 get { return base.Value; }
                 set

From b0340f77d829850af2aff0aef48085cef3b49197 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 08:57:14 +0900
Subject: [PATCH 20/21] Remove nested types completely.

---
 osu.Game/Graphics/UserInterface/OsuDropdown.cs   | 8 ++++----
 osu.Game/Graphics/UserInterface/OsuTabControl.cs | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 20b96a4045..7a31337660 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
                 accentColour = value;
                 if (Header != null)
                     ((OsuDropdownHeader)Header).AccentColour = value;
-                foreach (var item in MenuItems.OfType<OsuDropdownMenuItem<T>>())
+                foreach (var item in MenuItems.OfType<OsuDropdownMenuItem>())
                     item.AccentColour = value;
             }
         }
@@ -41,11 +41,11 @@ namespace osu.Game.Graphics.UserInterface
                 AccentColour = colours.PinkDarker;
         }
 
-        protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem<T>(text, value) { AccentColour = AccentColour };
+        protected override DropdownMenuItem<T> CreateMenuItem(string text, T value) => new OsuDropdownMenuItem(text, value) { AccentColour = AccentColour };
 
-        private class OsuDropdownMenuItem<T1> : DropdownMenuItem<T1>
+        private class OsuDropdownMenuItem : DropdownMenuItem<T>
         {
-            public OsuDropdownMenuItem(string text, T1 value) : base(text, value)
+            public OsuDropdownMenuItem(string text, T value) : base(text, value)
             {
                 Foreground.Padding = new MarginPadding(2);
 
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 2f26a1ca30..8283c1baa0 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Graphics.UserInterface
     {
         protected override Dropdown<T> CreateDropdown() => new OsuTabDropdown();
 
-        protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem<T> { Value = value };
+        protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem { Value = value };
 
         protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
 
@@ -52,12 +52,12 @@ namespace osu.Game.Graphics.UserInterface
                 var dropDown = Dropdown as OsuTabDropdown;
                 if (dropDown != null)
                     dropDown.AccentColour = value;
-                foreach (var item in TabContainer.Children.OfType<OsuTabItem<T>>())
+                foreach (var item in TabContainer.Children.OfType<OsuTabItem>())
                     item.AccentColour = value;
             }
         }
 
-        private class OsuTabItem<T1> : TabItem<T1>
+        private class OsuTabItem : TabItem<T>
         {
             private SpriteText text;
             private Box box;
@@ -74,7 +74,7 @@ namespace osu.Game.Graphics.UserInterface
                 }
             }
 
-            public new T1 Value
+            public new T Value
             {
                 get { return base.Value; }
                 set

From 859ee5d316d99f6f74d1c3188fcab9c8138d8071 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 23 Mar 2017 10:07:26 +0900
Subject: [PATCH 21/21] Tidy up DatabaseWorkingBeatmap.

---
 osu.Game/Database/DatabaseWorkingBeatmap.cs | 28 ++++++++-------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Database/DatabaseWorkingBeatmap.cs b/osu.Game/Database/DatabaseWorkingBeatmap.cs
index 0a7779f17b..1b37cf2fa0 100644
--- a/osu.Game/Database/DatabaseWorkingBeatmap.cs
+++ b/osu.Game/Database/DatabaseWorkingBeatmap.cs
@@ -21,12 +21,13 @@ namespace osu.Game.Database
         }
 
         private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
-        
+
         protected override Beatmap GetBeatmap()
         {
-            Beatmap beatmap;
             try
             {
+                Beatmap beatmap;
+
                 using (var reader = getReader())
                 {
                     BeatmapDecoder decoder;
@@ -40,42 +41,33 @@ namespace osu.Game.Database
                         using (var stream = new StreamReader(reader.GetStream(BeatmapSetInfo.StoryboardFile)))
                             decoder.Decode(stream, beatmap);
                 }
+
+                return beatmap;
             }
             catch { return null; }
-            return beatmap;
         }
-        
+
         protected override Texture GetBackground()
         {
-            Texture background;
             if (BeatmapInfo?.Metadata?.BackgroundFile == null)
                 return null;
+
             try
             {
                 using (var reader = getReader())
-                {
-                    background = new TextureStore(
-                        new RawTextureLoaderStore(reader),
-                        false).Get(BeatmapInfo.Metadata.BackgroundFile);
-                }
+                    return new TextureStore(new RawTextureLoaderStore(reader), false).Get(BeatmapInfo.Metadata.BackgroundFile);
             }
             catch { return null; }
-            return background;
         }
 
-        private ArchiveReader trackReader;
         protected override Track GetTrack()
         {
-            Track track;
             try
             {
-                //store a reference to the reader as we may continue accessing the stream in the background.
-                trackReader = getReader();
-                var trackData = trackReader?.GetStream(BeatmapInfo.Metadata.AudioFile);
-                track = trackData == null ? null : new TrackBass(trackData);
+                var trackData = getReader()?.GetStream(BeatmapInfo.Metadata.AudioFile);
+                return trackData == null ? null : new TrackBass(trackData);
             }
             catch { return null; }
-            return track;
         }
     }
 }
\ No newline at end of file