Update

Author: 0x5bfa

src/Files.App/Data/Items/WindowEx.cs

@@ -14,19 +14,35 @@
 
 namespace Files.App.Data.Items
 {
-	public unsafe class WindowEx : Window, IDisposable
+	/// <summary>
+	/// Represents base <see cref="Window"/> class to extend its features.
+	/// </summary>
+	public unsafe class WindowEx : Window
 	{
 		private readonly WNDPROC _oldWndProc;
 		private readonly WNDPROC _newWndProc;
 
 		private readonly ApplicationDataContainer _applicationDataContainer = ApplicationData.Current.LocalSettings;
 
+		/// <summary>
+		/// Gets hWnd of this <see cref="Window"/>.
+		/// </summary>
 		public nint WindowHandle { get; }
 
+		/// <summary>
+		/// Gets or sets min width of this <see cref="Window"/>.
+		/// </summary>
 		public int MinWidth { get; set; }
+
+		/// <summary>
+		/// Gets or sets min height of this <see cref="Window"/>.
+		/// </summary>
 		public int MinHeight { get; set; }
 
 		private bool _IsMaximizable = true;
+		/// <summary>
+		/// Gets or sets a value that indicates whether this <see cref="Window"/> can be maximizable.
+		/// </summary>
 		public bool IsMaximizable
 		{
 			get => _IsMaximizable;
@@ -54,6 +70,9 @@ public bool IsMaximizable
 		}
 
 		private bool _IsMinimizable = true;
+		/// <summary>
+		/// Gets or sets a value that indicates whether this <see cref="Window"/> can be minimizable.
+		/// </summary>
 		public bool IsMinimizable
 		{
 			get => _IsMinimizable;
@@ -66,6 +85,11 @@ public bool IsMinimizable
 			}
 		}
 
+		/// <summary>
+		/// Initializes <see cref="WindowEx"/> class.
+		/// </summary>
+		/// <param name="minWidth">Min width to set when initialized.</param>
+		/// <param name="minHeight">Min height to set when initialized.</param>
 		public unsafe WindowEx(int minWidth = 400, int minHeight = 300)
 		{
 			WindowHandle = WinRT.Interop.WindowNative.GetWindowHandle(this);
@@ -78,6 +102,8 @@ public unsafe WindowEx(int minWidth = 400, int minHeight = 300)
 			var pNewWndProc = Marshal.GetFunctionPointerForDelegate(_newWndProc);
 			var pOldWndProc = PInvoke.SetWindowLongPtr(new(WindowHandle), WINDOW_LONG_PTR_INDEX.GWL_WNDPROC, pNewWndProc);
 			_oldWndProc = Marshal.GetDelegateForFunctionPointer<WNDPROC>(pOldWndProc);
+
+			Closed += (s, e) => { StoreWindowPlacementData(); };
 		}
 
 		private unsafe void StoreWindowPlacementData()
@@ -116,9 +142,12 @@ private unsafe void StoreWindowPlacementData()
 			sw.Write(placementData);
 			sw.Flush();
 
-			var values = GetDataStore(out var oldDataExists);
+			var values = GetDataStore(out _, true);
 
-			values[oldDataExists ? "WindowPersistance_FilesMainWindow" : "MainWindowPlacementData"] = Convert.ToBase64String(data.ToArray());
+			if (_applicationDataContainer.Containers.ContainsKey("WinUIEx"))
+				_applicationDataContainer.Values.Remove("WinUIEx");
+
+			values["MainWindowPlacementData"] = Convert.ToBase64String(data.ToArray());
 		}
 
 		private void RestoreWindowPlacementData()
@@ -127,7 +156,7 @@ private void RestoreWindowPlacementData()
 			if (!GetType().Name.Equals(nameof(MainWindow), StringComparison.OrdinalIgnoreCase))
 				return;
 
-			var values = GetDataStore(out var oldDataExists);
+			var values = GetDataStore(out var oldDataExists, false);
 
 			byte[]? data = null;
 			if (values.TryGetValue(oldDataExists ? "WindowPersistance_FilesMainWindow" : "MainWindowPlacementData", out object? value))
@@ -179,13 +208,13 @@ private void RestoreWindowPlacementData()
 			return;
 		}
 
-		private IPropertySet GetDataStore(out bool oldDataExists)
+		private IPropertySet GetDataStore(out bool oldDataExists, bool useNewStore = true)
 		{
 			IPropertySet values;
 			oldDataExists = false;
 
 			// TODO: Remove this after a couple of months past
-			if (_applicationDataContainer.Containers.TryGetValue("WinUIEx", out var oldDataContainer))
+			if (!useNewStore && _applicationDataContainer.Containers.TryGetValue("WinUIEx", out var oldDataContainer))
 			{
 				values = oldDataContainer.Values;
 				oldDataExists = true;
@@ -251,12 +280,5 @@ private LRESULT NewWindowProc(HWND param0, uint param1, WPARAM param2, LPARAM pa
 
 			return PInvoke.CallWindowProc(_oldWndProc, param0, param1, param2, param3);
 		}
-
-		// Disposer
-
-		public void Dispose()
-		{
-			StoreWindowPlacementData();
-		}
 	}
 }