From 2190e6443a0265ba4d4db20a44b207b3a63a4760 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 1 Aug 2020 10:02:46 +0300
Subject: [PATCH 1/2] Apply height constraints to all settings dropdown

---
 osu.Game/Overlays/Settings/Sections/SkinSection.cs | 2 --
 osu.Game/Overlays/Settings/SettingsDropdown.cs     | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 04390a1193..596d3a9801 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -116,8 +116,6 @@ namespace osu.Game.Overlays.Settings.Sections
             private class SkinDropdownControl : DropdownControl
             {
                 protected override string GenerateItemText(SkinInfo item) => item.ToString();
-
-                protected override DropdownMenu CreateMenu() => base.CreateMenu().With(m => m.MaxHeight = 200);
             }
         }
 
diff --git a/osu.Game/Overlays/Settings/SettingsDropdown.cs b/osu.Game/Overlays/Settings/SettingsDropdown.cs
index 167061f485..1175ddaab8 100644
--- a/osu.Game/Overlays/Settings/SettingsDropdown.cs
+++ b/osu.Game/Overlays/Settings/SettingsDropdown.cs
@@ -38,6 +38,8 @@ namespace osu.Game.Overlays.Settings
                 Margin = new MarginPadding { Top = 5 };
                 RelativeSizeAxes = Axes.X;
             }
+
+            protected override DropdownMenu CreateMenu() => base.CreateMenu().With(m => m.MaxHeight = 200);
         }
     }
 }

From 5f52701273a8b41205bcd7a1c24fd02bb658560c Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Sat, 1 Aug 2020 10:11:34 +0300
Subject: [PATCH 2/2] Remove no longer necessary custom dropdown

---
 .../Ladder/Components/LadderEditorSettings.cs |  2 +-
 .../Components/LadderSettingsDropdown.cs      | 26 -------------------
 .../Ladder/Components/SettingsTeamDropdown.cs |  3 ++-
 3 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs

diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
index 4aea7ff4c0..fa530ea2c4 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/LadderEditorSettings.cs
@@ -81,7 +81,7 @@ namespace osu.Game.Tournament.Screens.Ladder.Components
         {
         }
 
-        private class SettingsRoundDropdown : LadderSettingsDropdown<TournamentRound>
+        private class SettingsRoundDropdown : SettingsDropdown<TournamentRound>
         {
             public SettingsRoundDropdown(BindableList<TournamentRound> rounds)
             {
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs
deleted file mode 100644
index 347e4d91e0..0000000000
--- a/osu.Game.Tournament/Screens/Ladder/Components/LadderSettingsDropdown.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.Settings;
-
-namespace osu.Game.Tournament.Screens.Ladder.Components
-{
-    public class LadderSettingsDropdown<T> : SettingsDropdown<T>
-    {
-        protected override OsuDropdown<T> CreateDropdown() => new DropdownControl();
-
-        private new class DropdownControl : SettingsDropdown<T>.DropdownControl
-        {
-            protected override DropdownMenu CreateMenu() => new Menu();
-
-            private new class Menu : OsuDropdownMenu
-            {
-                public Menu()
-                {
-                    MaxHeight = 200;
-                }
-            }
-        }
-    }
-}
diff --git a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
index a630e51e44..6604e3a313 100644
--- a/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
+++ b/osu.Game.Tournament/Screens/Ladder/Components/SettingsTeamDropdown.cs
@@ -6,11 +6,12 @@ using System.Collections.Specialized;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Overlays.Settings;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Screens.Ladder.Components
 {
-    public class SettingsTeamDropdown : LadderSettingsDropdown<TournamentTeam>
+    public class SettingsTeamDropdown : SettingsDropdown<TournamentTeam>
     {
         public SettingsTeamDropdown(BindableList<TournamentTeam> teams)
         {