(9a7d83a40) Fullscreen bug workarounds

Barotrauma/BarotraumaClient/Source/Characters/Health/CharacterHealth.cs

@@ -606,7 +606,7 @@ namespace Barotrauma
                         .ThenByDescending(a => a.Strength).FirstOrDefault();
                     if (affliction.DamagePerSecond > 0 || affliction.Strength > 0)
                     {
-                        var limbHealth = GetMatchingLimbHealth(affliction);
+                        var limbHealth = GetMathingLimbHealth(affliction);
                         if (limbHealth != null)
                         {
                             selectedLimbIndex = limbHealths.IndexOf(limbHealth);

Barotrauma/BarotraumaClient/Source/EventInput/EventInput.cs

@@ -256,4 +256,4 @@ namespace EventInput
         }
 #endif
     }
-}
+}

Barotrauma/BarotraumaClient/Source/GUI/GUIStyle.cs

@@ -118,21 +118,27 @@ namespace Barotrauma
                 switch (subElement.Name.ToString().ToLowerInvariant())
                 {
                     case "font":
+                        if (Font == null) { continue; }
                         Font.Size = GetFontSize(subElement);
                         break;
                     case "smallfont":
+                        if (SmallFont == null) { continue; }
                         SmallFont.Size = GetFontSize(subElement);
                         break;
                     case "largefont":
+                        if (LargeFont == null) { continue; }
                         LargeFont.Size = GetFontSize(subElement);
                         break;
                     case "objectivetitle":
+                        if (ObjectiveTitleFont == null) { continue; }
                         ObjectiveTitleFont.Size = GetFontSize(subElement);
                         break;
                     case "objectivename":
+                        if (ObjectiveNameFont == null) { continue; }
                         ObjectiveNameFont.Size = GetFontSize(subElement);
                         break;
                     case "videotitle":
+                        if (VideoTitleFont == null) { continue; }
                         VideoTitleFont.Size = GetFontSize(subElement);
                         break;
                 }

Barotrauma/BarotraumaClient/Source/GameMain.cs

@@ -120,7 +120,7 @@ namespace Barotrauma
             get;
             private set;
         }
-
+        
         public static int GraphicsWidth
         {
             get;
@@ -192,7 +192,19 @@ namespace Barotrauma
             FarseerPhysics.Settings.PositionIterations = 1;
         }
 
-        public void ApplyGraphicsSettings()
+        public void RequestGraphicsSettings()
+        {
+#if WINDOWS
+            if (WindowActive)
+            {
+#endif
+                ApplyGraphicsSettings();
+#if WINDOWS
+            }
+#endif
+        }
+
+        private void ApplyGraphicsSettings()
         {
             GraphicsWidth = Config.GraphicsWidth;
             GraphicsHeight = Config.GraphicsHeight;
@@ -208,13 +220,14 @@ namespace Barotrauma
             GraphicsDeviceManager.PreferredBackBufferWidth = GraphicsWidth;
             GraphicsDeviceManager.PreferredBackBufferHeight = GraphicsHeight;
             SetWindowMode(Config.WindowMode);
+            GraphicsDeviceManager.ApplyChanges();
 
             defaultViewport = GraphicsDevice.Viewport;
 
             OnResolutionChanged?.Invoke();
         }
 
-        public void SetWindowMode(WindowMode windowMode)
+        private void SetWindowMode(WindowMode windowMode)
         {
             WindowMode = windowMode;
             GraphicsDeviceManager.HardwareModeSwitch = Config.WindowMode != WindowMode.BorderlessWindowed;
@@ -223,8 +236,6 @@ namespace Barotrauma
 
             GraphicsDeviceManager.PreferredBackBufferWidth = GraphicsWidth;
             GraphicsDeviceManager.PreferredBackBufferHeight = GraphicsHeight;
-
-            GraphicsDeviceManager.ApplyChanges();
         }
 
         public void ResetViewPort()
@@ -242,7 +253,7 @@ namespace Barotrauma
         {
             base.Initialize();
 
-            ApplyGraphicsSettings();
+            RequestGraphicsSettings();
 
             ScissorTestEnable = new RasterizerState() { ScissorTestEnable = true };
 
@@ -281,6 +292,38 @@ namespace Barotrauma
 #endif
 
             loadingCoroutine = CoroutineManager.StartCoroutine(Load(canLoadInSeparateThread), "", canLoadInSeparateThread);
+
+#if WINDOWS
+            var gameForm = (System.Windows.Forms.Form)System.Windows.Forms.Form.FromHandle(Window.Handle);
+            gameForm.Activated += new EventHandler(HandleFocus);
+            gameForm.Deactivate += new EventHandler(HandleDefocus);
+            if (WindowActive) { HandleFocus(null, null); }
+#endif
+        }
+
+#if WINDOWS
+        private void HandleFocus(object sender, EventArgs e)
+        {
+            CoroutineManager.StopCoroutines("FocusCoroutine");
+            CoroutineManager.StartCoroutine(FocusCoroutine(),"FocusCoroutine");
+        }
+
+        private IEnumerable<object> FocusCoroutine()
+        {
+            yield return new WaitForSeconds(0.01f);
+            ApplyGraphicsSettings();
+            yield return CoroutineStatus.Success;
+        }
+
+        private void HandleDefocus(object sender, EventArgs e)
+        {
+            CoroutineManager.StopCoroutines("FocusCoroutine");
+            GraphicsDeviceManager.IsFullScreen = false;
+            GraphicsDeviceManager.ApplyChanges();
+        }
+#endif
+
+            loadingCoroutine = CoroutineManager.StartCoroutine(Load(canLoadInSeparateThread), "", canLoadInSeparateThread);
         }
         
         private void InitUserStats()

Barotrauma/BarotraumaClient/Source/GameSettings.cs

@@ -841,7 +841,7 @@ namespace Barotrauma
 
             GraphicsWidth = mode.Width;
             GraphicsHeight = mode.Height;
-            GameMain.Instance.ApplyGraphicsSettings();
+            GameMain.Instance.RequestGraphicsSettings();
             UnsavedSettings = true;
 
             return true;
@@ -980,7 +980,7 @@ namespace Barotrauma
 
             if (GameMain.WindowMode != GameMain.Config.WindowMode)
             {
-                GameMain.Instance.ApplyGraphicsSettings();
+                GameMain.Instance.RequestGraphicsSettings();
             }
 
             if (GameMain.GraphicsWidth != GameMain.Config.GraphicsWidth || GameMain.GraphicsHeight != GameMain.Config.GraphicsHeight)

Barotrauma/BarotraumaClient/Source/Program.cs

@@ -138,7 +138,7 @@ namespace Barotrauma
 
                         DebugConsole.NewMessage("Display size set to " + GameMain.Config.GraphicsWidth + "x" + GameMain.Config.GraphicsHeight, Microsoft.Xna.Framework.Color.Red);
 
-                        game.ApplyGraphicsSettings();
+                        game.RequestGraphicsSettings();
 
                         return true;
                     default:

Barotrauma/BarotraumaClient/Source/Screens/SteamWorkshopScreen.cs

@@ -967,7 +967,7 @@ namespace Barotrauma
                 {
                     try
                     {
-                        Barotrauma.OpenFileDialog ofd = new Barotrauma.OpenFileDialog()
+                        OpenFileDialog ofd = new OpenFileDialog()
                         {
                             Multiselect = true,
                             InitialDirectory = Path.GetFullPath(SteamManager.WorkshopItemStagingFolder),
@@ -1078,7 +1078,7 @@ namespace Barotrauma
                 {
                     try
                     {
-                        Barotrauma.OpenFileDialog ofd = new Barotrauma.OpenFileDialog()
+                        OpenFileDialog ofd = new OpenFileDialog()
                         {
                             InitialDirectory = Path.GetFullPath(SteamManager.WorkshopItemStagingFolder),
                             Title = TextManager.Get("workshopitemaddfiles"),

Barotrauma/BarotraumaClient/Source/Screens/SubEditorScreen.cs

@@ -1074,7 +1074,7 @@ namespace Barotrauma
             {
                 OnClicked = (btn, userdata) =>
                 {
-                    Barotrauma.OpenFileDialog ofd = new Barotrauma.OpenFileDialog()
+                    OpenFileDialog ofd = new OpenFileDialog()
                     {
                         InitialDirectory = Path.GetFullPath(Submarine.SavePath),
                         Filter = "PNG file|*.png",