From 6c2c522f307e2acb05bd41cec78c3dddf22a8cba Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Fri, 5 Apr 2019 16:14:57 +0300
Subject: [PATCH] (250dbe18e) Don't prevent item UI panels from overlapping
 with the chatbox or crew list areas when in the sub editor

---
 .../Source/GameSession/CrewManager.cs           | 17 +++++++----------
 .../BarotraumaClient/Source/Items/Item.cs       |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
index 736783e38..132a7cfc6 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
@@ -60,12 +60,19 @@ namespace Barotrauma
 
         public CrewManager(XElement element, bool isSinglePlayer)
             : this(isSinglePlayer)
+        {
+            return characterListBox.Rect;
+        }
+
+        partial void InitProjectSpecific()
         {
             guiFrame = new GUIFrame(new RectTransform(Vector2.One, GUICanvas.Instance), null, Color.Transparent)
             {
                 CanBeFocused = false
             };
 
+            Point scrollButtonSize = new Point((int)(200 * GUI.Scale), (int)(30 * GUI.Scale));
+
                 var characterInfo = new CharacterInfo(subElement);
                 characterInfos.Add(characterInfo);
                 foreach (XElement invElement in subElement.Elements())
@@ -125,16 +132,6 @@ namespace Barotrauma
             prevUIScale = GUI.Scale;
         }
 
-
-        #endregion
-
-        #region Character list management
-
-        public Rectangle GetCharacterListArea()
-        {
-            return characterListBox.Rect;
-        }
-
         partial void InitProjectSpecific()
         {
             guiFrame = new GUIFrame(new RectTransform(Vector2.One, GUICanvas.Instance), null, Color.Transparent)
diff --git a/Barotrauma/BarotraumaClient/Source/Items/Item.cs b/Barotrauma/BarotraumaClient/Source/Items/Item.cs
index 03cfc2bd8..bf8b5649d 100644
--- a/Barotrauma/BarotraumaClient/Source/Items/Item.cs
+++ b/Barotrauma/BarotraumaClient/Source/Items/Item.cs
@@ -612,7 +612,7 @@ namespace Barotrauma
             }
 
             List<Rectangle> disallowedAreas = new List<Rectangle>();
-            if (GameMain.GameSession?.CrewManager != null)
+            if (GameMain.GameSession?.CrewManager != null && Screen.Selected == GameMain.GameScreen)
             {
                 disallowedAreas.Add(GameMain.GameSession.CrewManager.GetCharacterListArea());
                 disallowedAreas.Add(new Rectangle(