From 73fb3fa3a4070bc407361d2fedd1503e762b9b4b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 19 Sep 2018 17:52:35 +0900
Subject: [PATCH 1/2] Fix macOS crashing in fullscreen mode

---
 .../Sections/Graphics/LayoutSettings.cs       | 45 ++++++++++++-------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 4a8164c6df..013204561b 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -35,6 +35,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             letterboxing = config.GetBindable<bool>(FrameworkSetting.Letterboxing);
             sizeFullscreen = config.GetBindable<Size>(FrameworkSetting.SizeFullscreen);
 
+            Container resolutionSettingsContainer;
+
             Children = new Drawable[]
             {
                 windowModeDropdown = new SettingsEnumDropdown<WindowMode>
@@ -42,13 +44,12 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     LabelText = "Screen mode",
                     Bindable = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
                 },
-                resolutionDropdown = new SettingsDropdown<Size>
+                resolutionSettingsContainer = new Container
                 {
-                    LabelText = "Resolution",
-                    ShowsDefaultIndicator = false,
-                    Items = getResolutions(),
-                    Bindable = sizeFullscreen
+                    RelativeSizeAxes = Axes.X,
+                    AutoSizeAxes = Axes.Y
                 },
+
                 new SettingsCheckbox
                 {
                     LabelText = "Letterboxing",
@@ -81,16 +82,28 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 },
             };
 
-            windowModeDropdown.Bindable.BindValueChanged(windowMode =>
+            var resolutions = getResolutions();
+            if (resolutions.Count > 1)
             {
-                if (windowMode == WindowMode.Fullscreen)
+                resolutionSettingsContainer.Child = resolutionDropdown = new SettingsDropdown<Size>
                 {
-                    resolutionDropdown.Show();
-                    sizeFullscreen.TriggerChange();
-                }
-                else
-                    resolutionDropdown.Hide();
-            }, true);
+                    LabelText = "Resolution",
+                    ShowsDefaultIndicator = false,
+                    Items = getResolutions(),
+                    Bindable = sizeFullscreen
+                };
+
+                windowModeDropdown.Bindable.BindValueChanged(windowMode =>
+                {
+                    if (windowMode == WindowMode.Fullscreen)
+                    {
+                        resolutionDropdown.Show();
+                        sizeFullscreen.TriggerChange();
+                    }
+                    else
+                        resolutionDropdown.Hide();
+                });
+            }
 
             letterboxing.BindValueChanged(isVisible =>
             {
@@ -102,7 +115,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             }, true);
         }
 
-        private IEnumerable<KeyValuePair<string, Size>> getResolutions()
+        private IReadOnlyList<KeyValuePair<string, Size>> getResolutions()
         {
             var resolutions = new KeyValuePair<string, Size>("Default", new Size(9999, 9999)).Yield();
 
@@ -112,8 +125,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                                                      .OrderByDescending(r => r.Width)
                                                      .ThenByDescending(r => r.Height)
                                                      .Select(res => new KeyValuePair<string, Size>($"{res.Width}x{res.Height}", new Size(res.Width, res.Height)))
-                                                     .Distinct()).ToList();
-            return resolutions;
+                                                     .Distinct());
+            return resolutions.ToList();
         }
     }
 }

From 1861547c86b44ab8faedc892bd10f175e25e4d59 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 20 Sep 2018 19:00:41 +0900
Subject: [PATCH 2/2] Apply review

---
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index 013204561b..df9370d0d8 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -49,7 +49,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y
                 },
-
                 new SettingsCheckbox
                 {
                     LabelText = "Letterboxing",
@@ -83,13 +82,14 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             };
 
             var resolutions = getResolutions();
+
             if (resolutions.Count > 1)
             {
                 resolutionSettingsContainer.Child = resolutionDropdown = new SettingsDropdown<Size>
                 {
                     LabelText = "Resolution",
                     ShowsDefaultIndicator = false,
-                    Items = getResolutions(),
+                    Items = resolutions,
                     Bindable = sizeFullscreen
                 };