Refresh position of non-INItializable EditorWindows when window is resized

Author: Rampastring

src/TSMapEditor/UI/Controls/EditorWindow.cs

@@ -1,5 +1,4 @@
 using Microsoft.Xna.Framework;
-using Microsoft.Xna.Framework.Graphics;
 using Rampastring.Tools;
 using Rampastring.XNAUI;
 using Rampastring.XNAUI.XNAControls;
@@ -31,6 +30,8 @@ public EditorWindow(WindowManager windowManager) : base(windowManager)
 
         protected bool CanBeMoved { get; set; } = true;
 
+        public bool CenterByDefault { get; set; } = true;
+
         protected bool IsDragged;
         private Point lastCursorPoint;
 
@@ -48,7 +49,10 @@ public override void Initialize()
 
         private void WindowManager_RenderResolutionChanged(object sender, EventArgs e)
         {
-            ConstrainPosition();
+            if (CenterByDefault)
+                CenterOnParent();
+            else
+                ConstrainPosition();
         }
 
         public override void Kill()
@@ -91,7 +95,7 @@ protected virtual void Show()
             InteractedWith?.Invoke(this, EventArgs.Empty);
         }
 
-        private void ConstrainPosition()
+        protected void ConstrainPosition()
         {
             if (ScaledWidth > WindowManager.RenderResolutionX)
                 X = (WindowManager.RenderResolutionX - ScaledWidth) / 2;

src/TSMapEditor/UI/Controls/INItializableWindow.cs

@@ -28,8 +28,6 @@ public INItializableWindow(WindowManager windowManager) : base(windowManager)
 
         protected string SubDirectory { get; set; } = "Windows";
 
-        public bool CenterByDefault { get; set; } = true;
-
         public T FindChild<T>(string childName, bool optional = false) where T : XNAControl
         {
             T child = FindChild<T>(Children, childName);
@@ -96,6 +94,19 @@ public override void Initialize()
             }
 
             _initialized = true;
+
+            WindowManager.WindowSizeChangedByUser += WindowManager_WindowSizeChangedByUser;
+        }
+
+        private void WindowManager_WindowSizeChangedByUser(object sender, EventArgs e)
+        {
+            RefreshLayout();
+        }
+
+        public override void Kill()
+        {
+            WindowManager.WindowSizeChangedByUser -= WindowManager_WindowSizeChangedByUser;
+            base.Kill();
         }
 
         protected override void ParseControlINIAttribute(IniFile iniFile, string key, string value)
@@ -122,6 +133,8 @@ public void RefreshLayout()
 
             if (CenterByDefault)
                 CenterOnParent();
+
+            ConstrainPosition();
         }
 
         private bool ReadINIForControl(XNAControl control, bool isForLayout = false)

src/TSMapEditor/UI/UIManager.cs

@@ -98,6 +98,7 @@ public override void Initialize()
 
             // We should be the first control to subscribe to this event
             WindowManager.WindowSizeChangedByUser += WindowManager_WindowSizeChangedByUser;
+            WindowManager.RenderResolutionChanged += WindowManager_RenderResolutionChanged;
 
             InitTheme();
 
@@ -283,6 +284,12 @@ private void ToggleFullscreen_Triggered(object sender, EventArgs e)
             }
         }
 
+        private void WindowManager_RenderResolutionChanged(object sender, EventArgs e)
+        {
+            Width = WindowManager.RenderResolutionX;
+            Height = WindowManager.RenderResolutionY;
+        }
+
         private void RefreshRenderResolution()
         {
             if (Game.Window.ClientBounds.Width == 0 || Game.Window.ClientBounds.Height == 0)
@@ -294,9 +301,10 @@ private void RefreshRenderResolution()
             if (newRenderWidth != WindowManager.RenderResolutionX || newRenderHeight != WindowManager.RenderResolutionY)
             {
                 WindowManager.SetRenderResolution(newRenderWidth, newRenderHeight);
+                // Done by event-handling code in WindowManager_RenderResolutionChanged
+                // Width = WindowManager.RenderResolutionX;
+                // Height = WindowManager.RenderResolutionY;
                 RenderResolutionChanged?.Invoke(this, EventArgs.Empty);
-                Width = WindowManager.RenderResolutionX;
-                Height = WindowManager.RenderResolutionY;
 
                 Parser.Instance.RefreshResolutionConstants(WindowManager);
                 SetNotificationManagerSizeAndPosition();
@@ -513,6 +521,7 @@ private void ClearResources()
 
             WindowManager.GameClosing -= WindowManager_GameClosing;
             WindowManager.WindowSizeChangedByUser -= WindowManager_WindowSizeChangedByUser;
+            WindowManager.RenderResolutionChanged -= WindowManager_RenderResolutionChanged;
             KeyboardCommands.Instance.ToggleFullscreen.Triggered -= ToggleFullscreen_Triggered;
 
             Disable();

src/TSMapEditor/UI/Windows/SelectObjectWindow.cs

@@ -67,7 +67,6 @@ public override void Initialize()
             AddChild(infoPanel);
 
             EnabledChanged += SelectObjectWindow_EnabledChanged;
-            WindowManager.WindowSizeChangedByUser += WindowManager_WindowSizeChangedByUser;
         }
 
         private void ConfirmSelection()
@@ -79,15 +78,9 @@ private void ConfirmSelection()
             }
         }
 
-        private void WindowManager_WindowSizeChangedByUser(object sender, EventArgs e)
-        {
-            RefreshLayout();
-        }
-
         public override void Kill()
         {
             Keyboard.OnKeyDown -= Keyboard_OnKeyDown;
-            WindowManager.WindowSizeChangedByUser -= WindowManager_WindowSizeChangedByUser;
             base.Kill();
         }
 

src/TSMapEditor/UI/Windows/TriggersWindow.cs

@@ -371,7 +371,6 @@ private void CreateRandomTriggerSetWindow_RandomTriggersSetCreated(object sender
 
         private void WindowManager_WindowSizeChangedByUser(object sender, EventArgs e)
         {
-            RefreshLayout();
             ListTriggers();
         }