From fb94cd43a48c181a7134eab66d1e4b47704c8247 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 25 Jun 2019 12:00:05 +0900
Subject: [PATCH] Remove unnecessary local item storage in SettingsDropdown

---
 .../Sections/Audio/AudioDevicesSettings.cs    |  2 +-
 .../Sections/Graphics/LayoutSettings.cs       |  2 +-
 .../Overlays/Settings/Sections/SkinSection.cs |  2 +-
 .../Overlays/Settings/SettingsDropdown.cs     | 26 ++++---------------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
index 7f7545eee3..2c25808170 100644
--- a/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Audio/AudioDevicesSettings.cs
@@ -73,7 +73,7 @@ protected override void LoadComplete()
 
         private class AudioDeviceSettingsDropdown : SettingsDropdown<string>
         {
-            protected override OsuDropdown<string> CreateDropdown() => new AudioDeviceDropdownControl { Items = Items };
+            protected override OsuDropdown<string> CreateDropdown() => new AudioDeviceDropdownControl();
 
             private class AudioDeviceDropdownControl : DropdownControl
             {
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 36c4fb5252..f4de4c0c41 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -237,7 +237,7 @@ private class UIScaleSlider : OsuSliderBar<float>
 
         private class ResolutionSettingsDropdown : SettingsDropdown<Size>
         {
-            protected override OsuDropdown<Size> CreateDropdown() => new ResolutionDropdownControl { Items = Items };
+            protected override OsuDropdown<Size> CreateDropdown() => new ResolutionDropdownControl();
 
             private class ResolutionDropdownControl : DropdownControl
             {
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 100022bd13..51c687314a 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -108,7 +108,7 @@ private class SizeSlider : OsuSliderBar<double>
 
         private class SkinSettingsDropdown : SettingsDropdown<SkinInfo>
         {
-            protected override OsuDropdown<SkinInfo> CreateDropdown() => new SkinDropdownControl { Items = Items };
+            protected override OsuDropdown<SkinInfo> CreateDropdown() => new SkinDropdownControl();
 
             private class SkinDropdownControl : DropdownControl
             {
diff --git a/osu.Game/Overlays/Settings/SettingsDropdown.cs b/osu.Game/Overlays/Settings/SettingsDropdown.cs
index de3f741cd7..167061f485 100644
--- a/osu.Game/Overlays/Settings/SettingsDropdown.cs
+++ b/osu.Game/Overlays/Settings/SettingsDropdown.cs
@@ -13,39 +13,23 @@ public class SettingsDropdown<T> : SettingsItem<T>
     {
         protected new OsuDropdown<T> Control => (OsuDropdown<T>)base.Control;
 
-        private IEnumerable<T> items = Enumerable.Empty<T>();
-
         public IEnumerable<T> Items
         {
-            get => items;
-            set
-            {
-                items = value;
-
-                if (Control != null)
-                    Control.Items = value;
-            }
+            get => Control.Items;
+            set => Control.Items = value;
         }
 
-        private IBindableList<T> itemSource;
-
         public IBindableList<T> ItemSource
         {
-            get => itemSource;
-            set
-            {
-                itemSource = value;
-
-                if (Control != null)
-                    Control.ItemSource = value;
-            }
+            get => Control.ItemSource;
+            set => Control.ItemSource = value;
         }
 
         public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(Control.Items.Select(i => i.ToString()));
 
         protected sealed override Drawable CreateControl() => CreateDropdown();
 
-        protected virtual OsuDropdown<T> CreateDropdown() => new DropdownControl { Items = Items, ItemSource = ItemSource };
+        protected virtual OsuDropdown<T> CreateDropdown() => new DropdownControl();
 
         protected class DropdownControl : OsuDropdown<T>
         {