Fix window positions not saving (#35055)

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>

diff --git a/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs b/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs
index ad496caa8ec4f8e340fd82c7274cc5ef7855529b..f838a69fdf11cca73a00edd99721021afef2c4cc 100644 (file)
--- a/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs
+++ b/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs
@@ -1,4 +1,5 @@
 using Robust.Client.GameObjects;
+using Robust.Client.UserInterface;
 using static Content.Shared.Atmos.Components.GasAnalyzerComponent;
 
 namespace Content.Client.Atmos.UI
@@ -16,9 +17,7 @@ namespace Content.Client.Atmos.UI
         {
             base.Open();
 
-            _window = new GasAnalyzerWindow();
-            _window.OnClose += OnClose;
-            _window.OpenCenteredLeft();
+            _window = this.CreateWindowCenteredLeft<GasAnalyzerWindow>();
         }
 
         protected override void ReceiveMessage(BoundUserInterfaceMessage message)

diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
index 44501767dd49c9e9456c2b8d6ba846c48e409330..55d7c8835d54003f545a68fae578810fc50b2f00 100644 (file)
--- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
+++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
@@ -21,11 +21,10 @@ namespace Content.Client.Crayon.UI
         protected override void Open()
         {
             base.Open();
-            _menu = this.CreateWindow<CrayonWindow>();
+            _menu = this.CreateWindowCenteredLeft<CrayonWindow>();
             _menu.OnColorSelected += SelectColor;
             _menu.OnSelected += Select;
             PopulateCrayons();
-            _menu.OpenCenteredLeft();
         }
 
         private void PopulateCrayons()

diff --git a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
index 53977eb636b30e40947502de1abf8d9dbfb6f3d7..f900eec1eb4a1895ee2b7046e503800e12b115a7 100644 (file)
--- a/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
+++ b/Content.Client/Humanoid/HumanoidMarkingModifierBoundUserInterface.cs
@@ -21,14 +21,12 @@ public sealed class HumanoidMarkingModifierBoundUserInterface : BoundUserInterfa
     {
         base.Open();
 
-        _window = this.CreateWindow<HumanoidMarkingModifierWindow>();
+        _window = this.CreateWindowCenteredLeft<HumanoidMarkingModifierWindow>();
         _window.OnMarkingAdded += SendMarkingSet;
         _window.OnMarkingRemoved += SendMarkingSet;
         _window.OnMarkingColorChange += SendMarkingSetNoResend;
         _window.OnMarkingRankChange += SendMarkingSet;
         _window.OnLayerInfoModified += SendBaseLayer;
-
-        _window.OpenCenteredLeft();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)

diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
index 90e52d7283767576987075a20b43643f2769f752..295d4848e5b096682ced7708545337dae19770d7 100644 (file)
--- a/Content.Client/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -64,11 +64,9 @@ namespace Content.Client.Inventory
         {
             base.Open();
 
-            _strippingMenu = this.CreateWindow<StrippingMenu>();
+            _strippingMenu = this.CreateWindowCenteredLeft<StrippingMenu>();
             _strippingMenu.OnDirty += UpdateMenu;
             _strippingMenu.Title = Loc.GetString("strippable-bound-user-interface-stripping-menu-title", ("ownerName", Identity.Name(Owner, EntMan)));
-
-            _strippingMenu?.OpenCenteredLeft();
         }
 
         protected override void Dispose(bool disposing)

diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
index a599f79152e37ff05a771864636f00597ade3a3f..4ddde885fa572c9938b7b573137c60ff56cf6664 100644 (file)
--- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
+++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
@@ -18,9 +18,8 @@ namespace Content.Client.Lathe.UI
         {
             base.Open();
 
-            _menu = this.CreateWindow<LatheMenu>();
+            _menu = this.CreateWindowCenteredRight<LatheMenu>();
             _menu.SetEntity(Owner);
-            _menu.OpenCenteredRight();
 
             _menu.OnServerListButtonPressed += _ =>
             {

diff --git a/Content.Client/Mech/Ui/MechBoundUserInterface.cs b/Content.Client/Mech/Ui/MechBoundUserInterface.cs
index 2130a8c609962a26f064c105c9dc7dc9c580d083..b3fbe8f7cb6d3607f0581b8c3e201c85c997c286 100644 (file)
--- a/Content.Client/Mech/Ui/MechBoundUserInterface.cs
+++ b/Content.Client/Mech/Ui/MechBoundUserInterface.cs
@@ -21,9 +21,8 @@ public sealed class MechBoundUserInterface : BoundUserInterface
     {
         base.Open();
 
-        _menu = this.CreateWindow<MechMenu>();
+        _menu = this.CreateWindowCenteredLeft<MechMenu>();
         _menu.SetEntity(Owner);
-        _menu.OpenCenteredLeft();
 
         _menu.OnRemoveButtonPressed += uid =>
         {

diff --git a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
index 550e1041b626d937c0bb6d26f42f45645145396a..9fa3b0c68f05ff89757ce24bf2e95382d3fbb28a 100644 (file)
--- a/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
+++ b/Content.Client/Power/Generator/PortableGeneratorBoundUserInterface.cs
@@ -17,7 +17,7 @@ public sealed class PortableGeneratorBoundUserInterface : BoundUserInterface
     protected override void Open()
     {
         base.Open();
-        _window = this.CreateWindow<GeneratorWindow>();
+        _window = this.CreateWindowCenteredLeft<GeneratorWindow>();
         _window.SetEntity(Owner);
         _window.OnState += args =>
         {
@@ -34,8 +34,6 @@ public sealed class PortableGeneratorBoundUserInterface : BoundUserInterface
         _window.OnPower += SetTargetPower;
         _window.OnEjectFuel += EjectFuel;
         _window.OnSwitchOutput += SwitchOutput;
-
-        _window.OpenCenteredLeft();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)

diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
index fe48b042f3e4d5f6aefaf04a6f345789b787cea2..1832f61c827a378ff57c857a9dfcab6cda49be6b 100644 (file)
--- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
+++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs
@@ -30,9 +30,8 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf
     protected override void Open()
     {
         base.Open();
-        _window = this.CreateWindow<OfferingWindow>();
+        _window = this.CreateWindowCenteredLeft<OfferingWindow>();
         _window.Title = Loc.GetString("salvage-expedition-window-title");
-        _window.OpenCenteredLeft();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)

diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
index d691f9acef3aac3dd6bc8bc8597c4b308c4091ed..a344ddd1eefc68d72b3f9358e92c045d875dbd26 100644 (file)
--- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
+++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
@@ -22,9 +22,8 @@ public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface
     {
         base.Open();
 
-        _window = this.CreateWindow<OfferingWindow>();
+        _window = this.CreateWindowCenteredLeft<OfferingWindow>();
         _window.Title = Loc.GetString("salvage-magnet-window-title");
-        _window.OpenCenteredLeft();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)

diff --git a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
index b8b4fb8a74693c0d61dafa790ef280df397ef334..8d84abed8a5c4c0da52deae998957bdb9c581fc0 100644 (file)
--- a/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs
@@ -21,10 +21,9 @@ public sealed class IFFConsoleBoundUserInterface : BoundUserInterface
     {
         base.Open();
 
-        _window = this.CreateWindow<IFFConsoleWindow>();
+        _window = this.CreateWindowCenteredLeft<IFFConsoleWindow>();
         _window.ShowIFF += SendIFFMessage;
         _window.ShowVessel += SendVesselMessage;
-        _window.OpenCenteredLeft();
     }
 
     protected override void UpdateState(BoundUserInterfaceState state)

diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
index 28b1b25adef03fb64697c99eb36de747fb945405..052bdacb89e051bfc870f3294404761c6aaa832d 100644 (file)
--- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
+++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
@@ -23,8 +23,7 @@ namespace Content.Client.VendingMachines
         {
             base.Open();
 
-            _menu = this.CreateWindow<VendingMachineMenu>();
-            _menu.OpenCenteredLeft();
+            _menu = this.CreateWindowCenteredLeft<VendingMachineMenu>();
             _menu.Title = EntMan.GetComponent<MetaDataComponent>(Owner).EntityName;
             _menu.OnItemSelected += OnItemSelected;
             Refresh();