Remember last position and state of Preview window

Author: David Khristepher Santos

Diffusion.Toolkit/Configuration/Settings.cs

@@ -75,6 +75,7 @@ public class Settings : SettingsContainer, IScanOptions
     private int _thumbnailSpacing;
     private ThumbnailViewMode _thumbnailViewMode;
     private RenderMode _renderMode;
+    private PreviewWindowState _previewWindowState;
 
     public Settings()
     {
@@ -124,6 +125,7 @@ public Settings()
 
         NavigationSection = new NavigationSectionSettings();
         NavigationSection.Attach(this);
+        PreviewWindowState = new PreviewWindowState();
 
         //if (initialize)
         //{
@@ -509,4 +511,22 @@ public RenderMode RenderMode
         get => _renderMode;
         set => UpdateValue(ref _renderMode, value);
     }
+
+    public PreviewWindowState PreviewWindowState
+    {
+        get => _previewWindowState;
+        set => UpdateValue(ref _previewWindowState, value);
+    }
+
+}
+
+public class PreviewWindowState
+{
+    public bool IsSet { get; set; }
+    public WindowState State { get; set; }
+    public double Top { get; set; }
+    public double Left { get; set; }
+    public double Width { get; set; }
+    public double Height { get; set; }
+    public bool IsFullScreen { get; set; }
 }

Diffusion.Toolkit/MainWindow.xaml.cs

@@ -40,6 +40,8 @@
 using Diffusion.Database.Models;
 using Image = System.Windows.Controls.Image;
 using System.Windows.Media;
+using SixLabors.ImageSharp;
+using Size = System.Windows.Size;
 
 namespace Diffusion.Toolkit
 {
@@ -365,7 +367,44 @@ private void PopoutPreview(bool hidePreview, bool maximized, bool fullscreen)
                     _previewWindow?.SetCurrentImage(image);
                 };
 
-                if (fullscreen)
+                void UpdatePreviewWindowState()
+                {
+                    _settings.PreviewWindowState.Top = _previewWindow.Top;
+                    _settings.PreviewWindowState.Left = _previewWindow.Left;
+                    _settings.PreviewWindowState.Height = _previewWindow.Height;
+                    _settings.PreviewWindowState.Width = _previewWindow.Width;
+                    _settings.PreviewWindowState.State = _previewWindow.WindowState;
+                    _settings.PreviewWindowState.IsFullScreen = _previewWindow.IsFullScreen;
+                    _settings.PreviewWindowState.IsSet = true;
+                    _settings.SetDirty();
+                }
+
+                _previewWindow.LocationChanged += (sender, args) =>
+                {
+                    UpdatePreviewWindowState();
+                };
+
+                _previewWindow.SizeChanged += (sender, args) =>
+                {
+                    UpdatePreviewWindowState();
+                };
+
+                _previewWindow.StateChanged += (sender, args) =>
+                {
+                    UpdatePreviewWindowState();
+                };
+
+                if (_settings.PreviewWindowState.IsSet)
+                {
+                    _previewWindow.WindowStartupLocation = WindowStartupLocation.Manual;
+                    _previewWindow.WindowState = _settings.PreviewWindowState.State;
+                    _previewWindow.Width = _settings.PreviewWindowState.Width;
+                    _previewWindow.Height = _settings.PreviewWindowState.Height;
+                    _previewWindow.Top = _settings.PreviewWindowState.Top;
+                    _previewWindow.Left = _settings.PreviewWindowState.Left;
+                }
+
+                if (fullscreen || _settings.PreviewWindowState.IsFullScreen)
                 {
                     _previewWindow.ShowFullScreen();
                 }

Diffusion.Toolkit/Release Notes/What's New v1.9.1.md

@@ -14,4 +14,5 @@
 * Fix for root folder name at the root of a drive (e.g. `X:\`) showing as blank
 * Fix for AutoRefresh being broken by the last update
 * Date search fix for Query
-* Prevent clicking on query input to edit from dismissing it
+* Prevent clicking on query input to edit from dismissing it
+* Remember last position and state of Preview window