From 634c4a7780b3692074fd48edecf6d8702d40aac4 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 23 Feb 2025 23:57:57 +1100 Subject: [PATCH] Fix window positions not saving (#35055) Co-authored-by: Kevin Zheng --- Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs | 5 ++--- Content.Client/Crayon/UI/CrayonBoundUserInterface.cs | 3 +-- .../Humanoid/HumanoidMarkingModifierBoundUserInterface.cs | 4 +--- Content.Client/Inventory/StrippableBoundUserInterface.cs | 4 +--- Content.Client/Lathe/UI/LatheBoundUserInterface.cs | 3 +-- Content.Client/Mech/Ui/MechBoundUserInterface.cs | 3 +-- .../Power/Generator/PortableGeneratorBoundUserInterface.cs | 4 +--- .../Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs | 3 +-- Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs | 3 +-- Content.Client/Shuttles/BUI/IFFConsoleBoundUserInterface.cs | 3 +-- .../VendingMachines/VendingMachineBoundUserInterface.cs | 3 +-- 11 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs b/Content.Client/Atmos/UI/GasAnalyzerBoundUserInterface.cs index ad496caa8e..f838a69fdf 100644 --- 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(); } protected override void ReceiveMessage(BoundUserInterfaceMessage message) diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs index 44501767dd..55d7c8835d 100644 --- 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(); + _menu = this.CreateWindowCenteredLeft(); _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 53977eb636..f900eec1eb 100644 --- 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(); + _window = this.CreateWindowCenteredLeft(); _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 90e52d7283..295d4848e5 100644 --- 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 = this.CreateWindowCenteredLeft(); _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 a599f79152..4ddde885fa 100644 --- 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(); + _menu = this.CreateWindowCenteredRight(); _menu.SetEntity(Owner); - _menu.OpenCenteredRight(); _menu.OnServerListButtonPressed += _ => { diff --git a/Content.Client/Mech/Ui/MechBoundUserInterface.cs b/Content.Client/Mech/Ui/MechBoundUserInterface.cs index 2130a8c609..b3fbe8f7cb 100644 --- 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(); + _menu = this.CreateWindowCenteredLeft(); _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 550e1041b6..9fa3b0c68f 100644 --- 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(); + _window = this.CreateWindowCenteredLeft(); _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 fe48b042f3..1832f61c82 100644 --- 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(); + _window = this.CreateWindowCenteredLeft(); _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 d691f9acef..a344ddd1ee 100644 --- 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(); + _window = this.CreateWindowCenteredLeft(); _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 b8b4fb8a74..8d84abed8a 100644 --- 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(); + _window = this.CreateWindowCenteredLeft(); _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 28b1b25ade..052bdacb89 100644 --- 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(); - _menu.OpenCenteredLeft(); + _menu = this.CreateWindowCenteredLeft(); _menu.Title = EntMan.GetComponent(Owner).EntityName; _menu.OnItemSelected += OnItemSelected; Refresh(); -- 2.51.2