From 9f788f58548d629144c4b8946b74542b424ea7a4 Mon Sep 17 00:00:00 2001
From: Owen Young <owen.young8699@gmail.com>
Date: Mon, 22 Mar 2021 22:52:16 -0500
Subject: [PATCH] removed code from OsuGameBase for fullscreen.....OsuSetting
 still exists but cannot figure out a way to set it to a default and have it
 actually work

---
 osu.Game/OsuGame.cs                                         | 6 +++---
 osu.Game/OsuGameBase.cs                                     | 4 ----
 .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs   | 6 ++++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index ff215b63e5..2f2428e781 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -126,7 +126,7 @@ namespace osu.Game
 
         private Bindable<int> configSkin;
 
-        private Bindable<WindowMode> windowMode;
+        // private Bindable<WindowMode> windowMode;
 
         private readonly string[] args;
 
@@ -573,8 +573,8 @@ namespace osu.Game
 
             dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
 
-            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
+            // windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            // frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
 
             AddRange(new Drawable[]
             {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index bcd384604f..8b1fe20708 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -120,7 +120,6 @@ namespace osu.Game
         protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
 
         private Bindable<bool> fpsDisplayVisible;
-        private Bindable<WindowMode> windowMode;
 
         public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();
 
@@ -363,9 +362,6 @@ namespace osu.Game
             fpsDisplayVisible.ValueChanged += visible => { FrameStatistics.Value = visible.NewValue ? FrameStatisticsMode.Minimal : FrameStatisticsMode.None; };
             fpsDisplayVisible.TriggerChange();
 
-            windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
-            windowMode.Value = WindowMode.Fullscreen;
-
             FrameStatistics.ValueChanged += e => fpsDisplayVisible.Value = e.NewValue != FrameStatisticsMode.None;
         }
 
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
index ab662cb9a0..a0cb8fc2de 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
@@ -12,6 +12,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Framework.Logging;
 using osu.Framework.Platform;
 using osu.Game.Configuration;
 using osu.Game.Graphics.Containers;
@@ -57,7 +58,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
             scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
             scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
             scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
-            windowMode = osuConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
+            windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
+            Logger.Log($"windowMode {windowMode.Value}");
 
             if (host.Window != null)
             {
@@ -71,7 +73,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                 {
                     LabelText = "Screen mode",
                     ItemSource = windowModes,
-                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
+                    Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode)
                 },
                 resolutionDropdown = new ResolutionSettingsDropdown
                 {