move viewwindow last state to global

Author: Carl Chang

Helpers/Setting.cs

@@ -214,7 +214,7 @@ public static DataTable MappedPasswords {
         }
 
         private static bool immersionMode;
-        //this one is not saved
+        //not saved
         public static bool ImmersionMode {
             get => immersionMode;
             set {
@@ -224,6 +224,9 @@ public static bool ImmersionMode {
             }
         }
 
+        //not saved
+        public static Rect LastViewWindowRect;
+
         private static SlideAnimConfig slideAnimConfig = new SlideAnimConfig();
         [AppConfig]
         public static SlideAnimConfig SlideAnimConfig {

MainWindow.xaml.cs

@@ -49,7 +49,6 @@ public string CurrentPath {
 
         private VirtualizingWrapPanel virWrapPanel;
         private Rect lastWindowRect;
-        internal Rect lastViewWindowRect;
 
         public MainWindow()
         {
@@ -261,7 +260,7 @@ internal void LoadPath(ObjectInfo objInfo, ViewWindow viewWin = null) {
                 //using a new ObjectInfo to avoid confusion and reduce chance of holding ImageSource
                 Dispatcher.Invoke(() => {
                     if (viewWin == null)
-                        new ViewWindow(objInfo.ContainerPath, objInfo.FileName, this).Show();
+                        new ViewWindow(objInfo.ContainerPath, objInfo.FileName).Show();
                     else
                         viewWin.ViewPath = (objInfo.ContainerPath, objInfo.FileName);
                 });

ViewWindow.xaml.cs

@@ -16,8 +16,6 @@ namespace ZipImageViewer
     public partial class ViewWindow : BorderlessWindow, INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;
-        private readonly MainWindow mainWin;
-
 
         private (string BasePath, string SubPath) viewPath;
         /// <summary>
@@ -118,32 +116,29 @@ public ObservablePair<DependencyProps, DependencyProps> TransParams {
         private Setting.Transition LastTransition = Setting.Transition.None;
 
 
-        public ViewWindow(string basePath, string subPath, MainWindow win = null)
+        public ViewWindow(string basePath, string subPath)
         {
             InitializeComponent();
             Opacity = 0d;
-            mainWin = win;
 
             ViewPath = (basePath, subPath);
         }
 
         private void ViewWindow_Loaded(object sender, RoutedEventArgs e) {
             //restore last state
-            if (mainWin != null) {
-                if (mainWin.lastViewWindowRect != default) {
-                    Top = mainWin.lastViewWindowRect.Top;
-                    Left = mainWin.lastViewWindowRect.Left;
-                    if (mainWin.lastViewWindowRect.Size != default) {
-                        Width = mainWin.lastViewWindowRect.Width;
-                        Height = mainWin.lastViewWindowRect.Height;
-                    }
-                    else {
-                        WindowState = WindowState.Maximized;
-                    }
+            if (Setting.LastViewWindowRect != default) {
+                Top = Setting.LastViewWindowRect.Top;
+                Left = Setting.LastViewWindowRect.Left;
+                if (Setting.LastViewWindowRect.Size != default) {
+                    Width = Setting.LastViewWindowRect.Width;
+                    Height = Setting.LastViewWindowRect.Height;
+                }
+                else {
+                    WindowState = WindowState.Maximized;
                 }
-                if (Setting.ImmersionMode)
-                    SwitchFullScreen(this, ref mainWin.lastViewWindowRect, true);
             }
+            if (Setting.ImmersionMode)
+                SwitchFullScreen(this, ref Setting.LastViewWindowRect, true);
 
             //fade in window content
             this.AnimateDoubleCubicEase(OpacityProperty, 1d, 100, EasingMode.EaseOut);
@@ -155,12 +150,10 @@ private void ViewWin_Closed(object sender, EventArgs e) {
 
         private void ViewWin_Closing(object sender, CancelEventArgs e) {
             //save window state
-            if (mainWin != null) {
-                if (WindowState == WindowState.Maximized || IsFullScreen(this))
-                    mainWin.lastViewWindowRect = new Rect(Left, Top, 0d, 0d);
-                else
-                    mainWin.lastViewWindowRect = new Rect(Left, Top, ActualWidth, ActualHeight);
-            }
+            if (WindowState == WindowState.Maximized || IsFullScreen(this))
+                Setting.LastViewWindowRect = new Rect(Left, Top, 0d, 0d);
+            else
+                Setting.LastViewWindowRect = new Rect(Left, Top, ActualWidth, ActualHeight);
 
             IM.Source = null;
             IM = null;