From 8184f0e6f6495ab7bc2a8f5f1e9b46c6bb0f72e7 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue, 4 Jun 2019 16:03:00 +0300
Subject: [PATCH] (6b3ca1aae) Fixed the "item in use by x" text not being
 visible in item interfaces

---
 .../BarotraumaClient/Source/GameSettings.cs      |  9 +++++++++
 Barotrauma/BarotraumaClient/Source/Items/Item.cs |  8 ++++----
 .../Source/Screens/ServerListScreen.cs           | 16 ----------------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/GameSettings.cs b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
index 288cbcd30..bfd0ad116 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSettings.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSettings.cs
@@ -239,6 +239,15 @@ namespace Barotrauma
             {
                 displayModeDD.SelectItem(GameMain.Config.WindowMode);
             }
+#endif
+            displayModeDD.OnSelected = (guiComponent, obj) =>
+            {
+                displayModeDD.SelectItem(WindowMode.Fullscreen);
+            }
+            else
+            {
+                displayModeDD.SelectItem(GameMain.Config.WindowMode);
+            }
 #endif
             displayModeDD.OnSelected = (guiComponent, obj) =>
             {
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Item.cs b/Barotrauma/BarotraumaClient/Source/Items/Item.cs
index 71260001a..83476d546 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Item.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Item.cs
@@ -51,7 +51,7 @@ namespace Barotrauma
                 {
                     itemInUseWarning = new GUITextBlock(new RectTransform(new Point(10), GUI.Canvas), "", 
                         textColor: Color.Orange, color: Color.Black, 
-                        textAlignment:Alignment.Center, style: "OuterGlow");
+                        textAlignment: Alignment.Center, style: "OuterGlow");
                 }
                 return itemInUseWarning;
             }
@@ -662,7 +662,7 @@ namespace Barotrauma
                 new Rectangle(
                     20, 20, 
                     GameMain.GraphicsWidth - 40, 
-                    HUDLayoutSettings.InventoryTopY > 0 ? HUDLayoutSettings.InventoryTopY - 20 : GameMain.GraphicsHeight - 80));
+                    HUDLayoutSettings.InventoryTopY > 0 ? HUDLayoutSettings.InventoryTopY - 40 : GameMain.GraphicsHeight - 80));
 
             foreach (ItemComponent ic in activeHUDs)
             {
@@ -740,9 +740,9 @@ namespace Barotrauma
                 }
             }
 
-            if (itemInUseWarning != null && mergedHUDRect != Rectangle.Empty)
+            if (mergedHUDRect != Rectangle.Empty)
             {
-                itemInUseWarning.Visible = false;
+                if (itemInUseWarning != null) { itemInUseWarning.Visible = false; }
                 foreach (Character otherCharacter in Character.CharacterList)
                 {
                     if (otherCharacter != character &&
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
index 50a985292..f2ec192dd 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs
@@ -217,22 +217,6 @@ namespace Barotrauma
             return true;
         }
 
-        private bool RefreshJoinButtonState(GUIComponent component, object obj)
-        {
-            if (obj == null || waitingForRefresh) { return false; }
-
-            if (!string.IsNullOrWhiteSpace(clientNameBox.Text) && !string.IsNullOrWhiteSpace(ipBox.Text))
-            {
-                joinButton.Enabled = true;
-            }
-            else
-            {
-                joinButton.Enabled = false;
-            }
-
-            return true;
-        }
-
         private bool SelectServer(GUIComponent component, object obj)
         {
             if (obj == null || waitingForRefresh || (!(obj is ServerInfo))) { return false; }