(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaClient/Source/GUI/ChatBox.cs

@@ -26,7 +26,21 @@ namespace Barotrauma
         private bool isSinglePlayer;
         public bool IsSinglePlayer => isSinglePlayer;
 
-        private bool toggleOpen = true;
+        private bool _toggleOpen = true;
+        public bool ToggleOpen
+        {
+            get { return _toggleOpen; }
+            set
+            {
+                if (_toggleOpen == value) { return; }
+                _toggleOpen = GameMain.Config.ChatOpen = value;
+                foreach (GUIComponent child in ToggleButton.Children)
+                {
+                    child.SpriteEffects = _toggleOpen == (HUDLayoutSettings.ChatBoxAlignment == Alignment.Right) ?
+                      SpriteEffects.FlipHorizontally : SpriteEffects.None;
+                }
+            }
+        }
         private float openState;
 
         private float prevUIScale;
@@ -81,12 +95,7 @@ namespace Barotrauma
 
             toggleButton.OnClicked += (GUIButton btn, object userdata) =>
             {
-                toggleOpen = !toggleOpen;
-                foreach (GUIComponent child in btn.Children)
-                {
-                    child.SpriteEffects = toggleOpen == (HUDLayoutSettings.ChatBoxAlignment == Alignment.Right) ?
-                      SpriteEffects.FlipHorizontally : SpriteEffects.None;
-                }
+                ToggleOpen = !ToggleOpen;
                 return true;
             };
 
@@ -124,6 +133,8 @@ namespace Barotrauma
                 }
                 return true;
             };
+
+            ToggleOpen = GameMain.Config.ChatOpen;
         }
 
         public bool TypingChatMessage(GUITextBox textBox, string text)
@@ -228,7 +239,7 @@ namespace Barotrauma
 
             chatBox.UpdateScrollBarSize();
 
-            if (!toggleOpen)
+            if (!ToggleOpen)
             {
                 var popupMsg = new GUIFrame(new RectTransform(Vector2.One, guiFrame.RectTransform), style: "GUIToolTip")
                 {
@@ -313,9 +324,7 @@ namespace Barotrauma
                 prevUIScale = GUI.Scale;
             }
 
-
-
-            if (toggleOpen || (inputBox != null && inputBox.Selected))
+            if (ToggleOpen || (inputBox != null && inputBox.Selected))
             {
                 openState += deltaTime * 5.0f;
                 //delete all popup messages when the chatbox is open