(3622747f3) Unstable 0.9.705.0

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemContainer.cs

@@ -13,6 +13,8 @@ namespace Barotrauma.Items.Components
 
         private GUICustomComponent guiCustomComponent;
 
+        private Point prevResolution;
+
         public Sprite InventoryTopSprite
         {
             get { return inventoryTopSprite; }
@@ -118,7 +120,7 @@ namespace Barotrauma.Items.Components
             {
                 //if a GUIFrame has been defined, draw the inventory inside it
                 CreateGUI();
-                GameMain.Instance.OnResolutionChanged += () => { GuiFrame.ClearChildren(); CreateGUI(); };
+                prevResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
             }
         }
 
@@ -165,6 +167,16 @@ namespace Barotrauma.Items.Components
         public void Draw(SpriteBatch spriteBatch, bool editing = false, float itemDepth = -1)
         {
             if (hideItems || (item.body != null && !item.body.Enabled)) { return; }
+            
+            if ((prevResolution.X > 0 && prevResolution.Y > 0) &&
+                (prevResolution.X != GameMain.GraphicsWidth || prevResolution.Y != GameMain.GraphicsHeight))
+            {
+                GuiFrame.ClearChildren(); 
+                CreateGUI();
+
+                prevResolution = new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight);
+            }
+
             DrawContainedItems(spriteBatch, itemDepth);
         }
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Deconstructor.cs

@@ -23,12 +23,14 @@ namespace Barotrauma.Items.Components
         partial void InitProjSpecific(XElement element)
         {
             CreateGUI();
-            GameMain.Instance.OnResolutionChanged += () =>
-            {
-                GuiFrame.ClearChildren();
-                CreateGUI();
-                OnItemLoadedProjSpecific();
-            };
+            GameMain.Instance.OnResolutionChanged += RecreateGUI;
+        }
+
+        private void RecreateGUI()
+        {
+            GuiFrame.ClearChildren();
+            CreateGUI();
+            OnItemLoadedProjSpecific();
         }
 
         private void CreateGUI()
@@ -168,5 +170,10 @@ namespace Barotrauma.Items.Components
             SetActive(msg.ReadBoolean());
             progressTimer = msg.ReadSingle();
         }
+
+        protected override void RemoveComponentSpecific()
+        {
+            GameMain.Instance.OnResolutionChanged -= RecreateGUI;
+        }
     }
 }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Fabricator.cs

@@ -42,12 +42,14 @@ namespace Barotrauma.Items.Components
         partial void InitProjSpecific()
         {
             CreateGUI();
-            GameMain.Instance.OnResolutionChanged += () =>
-            {
-                GuiFrame.ClearChildren();
-                CreateGUI();
-                OnItemLoadedProjSpecific();
-            };
+            GameMain.Instance.OnResolutionChanged += RecreateGUI;
+        }
+
+        private void RecreateGUI()
+        {
+            GuiFrame.ClearChildren();
+            CreateGUI();
+            OnItemLoadedProjSpecific();
         }
 
         private void CreateGUI()
@@ -600,5 +602,10 @@ namespace Barotrauma.Items.Components
                 StartFabricating(fabricationRecipes[itemIndex], user);
             }
         }
+
+        protected override void RemoveComponentSpecific()
+        {
+            GameMain.Instance.OnResolutionChanged -= RecreateGUI;
+        }
     }
 }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Sonar.cs

@@ -638,13 +638,14 @@ namespace Barotrauma.Items.Components
                 signalWarningText.Text = TextManager.Get(signalStrength <= 0.0f ? "SonarNoSignal" : "SonarSignalWeak");
                 signalWarningText.Color = signalStrength <= 0.0f ? negativeColor : warningColor;
                 signalWarningText.Visible = true;
+                return;
             }
             else
             {
                 signalWarningText.Visible = false;
             }
 
-            if (GameMain.GameSession == null) return;
+            if (GameMain.GameSession == null) { return; }
 
             DrawMarker(spriteBatch,
                 GameMain.GameSession.StartLocation.Name,
@@ -1376,6 +1377,8 @@ namespace Barotrauma.Items.Components
                 sprite.Remove();
             }
             targetIcons.Clear();
+
+            GameMain.Instance.OnResolutionChanged -= RecreateGUI;
         }
 
         public void ClientWrite(IWriteMessage msg, object[] extraData = null)

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Steering.cs

@@ -804,6 +804,8 @@ namespace Barotrauma.Items.Components
             maintainPosIndicator?.Remove();
             maintainPosOriginIndicator?.Remove();
             steeringIndicator?.Remove();
+
+            GameMain.Instance.OnResolutionChanged -= RecreateGUI;
         }
 
         public void ClientWrite(IWriteMessage msg, object[] extraData = null)

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Repairable.cs

@@ -79,11 +79,11 @@ namespace Barotrauma.Items.Components
                 RelativeSpacing = 0.02f
             };
 
-            progressBar = new GUIProgressBar(new RectTransform(new Vector2(0.7f, 1.0f), progressBarHolder.RectTransform),
+            progressBar = new GUIProgressBar(new RectTransform(new Vector2(0.6f, 1.0f), progressBarHolder.RectTransform),
                 color: GUI.Style.Green, barSize: 0.0f, style: "DeviceProgressBar");
             repairButtonText = TextManager.Get("RepairButton");
             repairingText = TextManager.Get("Repairing");
-            RepairButton = new GUIButton(new RectTransform(new Vector2(0.3f, 1.0f), progressBarHolder.RectTransform, Anchor.TopCenter), repairButtonText)
+            RepairButton = new GUIButton(new RectTransform(new Vector2(0.4f, 1.0f), progressBarHolder.RectTransform, Anchor.TopCenter), repairButtonText)
             {
                 OnClicked = (btn, obj) =>
                 {
@@ -92,6 +92,7 @@ namespace Barotrauma.Items.Components
                     return true;
                 }
             };
+            RepairButton.TextBlock.AutoScaleHorizontal = true;
             progressBarHolder.RectTransform.MinSize = RepairButton.RectTransform.MinSize;
             RepairButton.RectTransform.MinSize = new Point((int)(RepairButton.TextBlock.TextSize.X * 1.2f), RepairButton.RectTransform.MinSize.Y);
 

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/Connection.cs

@@ -187,7 +187,7 @@ namespace Barotrauma.Items.Components
             x = (int)(x + width / 2 - step * (panel.DisconnectedWires.Count() - 1) / 2);
             foreach (Wire wire in panel.DisconnectedWires)
             {
-                if (wire == DraggingConnected && !mouseInRect) { continue; }
+                if (wire == DraggingConnected) { continue; }
 
                 Connection recipient = wire.OtherConnection(null);
                 string label = recipient == null ? "" : recipient.item.Name + $" ({recipient.DisplayName})";

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/CustomInterface.cs

@@ -222,5 +222,10 @@ namespace Barotrauma.Items.Components
                 }
             }
         }
+
+        protected override void RemoveComponentSpecific()
+        {
+            GameMain.Instance.OnResolutionChanged -= RecreateGUI;
+        }
     }
 }