From 1e02bf9d36cabb031238d66e5102754284ac860a Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue, 23 Apr 2019 11:19:45 +0300
Subject: [PATCH] (450a14ae6) Resolution button is locked on Windows when in
 borderless windowed.

---
 Barotrauma/BarotraumaClient/Source/GameSettings.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
index e80d9fa8d..437625fe5 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
@@ -163,7 +163,7 @@ namespace Barotrauma
                 {
                     UserData = tab
                 };
-                tabButtons[(int)tab] = new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), tabButtonHolder.RectTransform), 
+                tabButtons[(int)tab] = new GUIButton(new RectTransform(new Vector2(0.25f, 1.0f), tabButtonHolder.RectTransform),
                     TextManager.Get("SettingsTab." + tab.ToString()), style: "GUITabButton")
                 {
                     UserData = tab,
@@ -201,7 +201,7 @@ namespace Barotrauma
             var resolutionDD = new GUIDropDown(new RectTransform(new Vector2(1.0f, 0.05f), leftColumn.RectTransform), elementCount: supportedDisplayModes.Count)
             {
                 OnSelected = SelectResolution,
-#if OSX
+#if !LINUX
                 ButtonEnabled = GameMain.Config.WindowMode == WindowMode.Windowed
 #endif
         };
@@ -241,7 +241,7 @@ namespace Barotrauma
             {
                 UnsavedSettings = true;
                 GameMain.Config.WindowMode = (WindowMode)guiComponent.UserData;
-#if OSX
+#if !LINUX
                 resolutionDD.ButtonEnabled = GameMain.Config.WindowMode == WindowMode.Windowed;
 #endif
                 return true;
@@ -437,7 +437,7 @@ namespace Barotrauma
                 UnsavedSettings = true;
                 return true;
             };
-            
+
             new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.05f), audioSliders.RectTransform), TextManager.Get("VoiceChat"));
 
             IList<string> deviceNames = Alc.GetString((IntPtr)null, AlcGetStringList.CaptureDeviceSpecifier);
@@ -646,7 +646,7 @@ namespace Barotrauma
                     return true;
                 }
             };
-            
+
             var inputFrame = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.75f), controlsLayoutGroup.RectTransform), isHorizontal: true)
                 { Stretch = true, RelativeSpacing = 0.03f };