Show side by side fixes and refactors #89

Ruben2776 · Sep 6, 2024 · 34329bc · 34329bc
1 parent 146aa81
commit 34329bc
Show file tree

Hide file tree

Showing 5 changed files with 245 additions and 234 deletions.
diff --git a/src/PicView.Avalonia.Win32/Views/WinMainWindow.axaml.cs b/src/PicView.Avalonia.Win32/Views/WinMainWindow.axaml.cs
@@ -79,6 +79,6 @@ private void Control_OnSizeChanged(object? sender, SizeChangedEventArgs e)
             return;
         }
         var wm = (MainViewModel)DataContext;
-        //WindowHelper.SetSize(wm);
+        WindowHelper.SetSize(wm);
     }
 }
diff --git a/src/PicView.Avalonia/UI/FunctionsHelper.cs b/src/PicView.Avalonia/UI/FunctionsHelper.cs
@@ -807,34 +807,7 @@ public static async Task ChangeBackground()
 
     public static async Task ShowSideBySide()
     {
-        if (Vm is null)
-        {
-            return;
-        }
-        await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Vm.ImageViewer.MainImage.InvalidateVisual();
-        });
-
-        if (SettingsHelper.Settings.ImageScaling.ShowImageSideBySide)
-        {
-            SettingsHelper.Settings.ImageScaling.ShowImageSideBySide = false;
-            Vm.IsShowingSideBySide = false;
-            Vm.SecondaryImageSource = null;
-            WindowHelper.SetSize(Vm.ImageWidth, Vm.ImageHeight, 0, 0, Vm.RotationAngle, Vm);
-        }
-        else
-        {
-            SettingsHelper.Settings.ImageScaling.ShowImageSideBySide = true;
-            Vm.IsShowingSideBySide = true;
-            if (NavigationHelper.CanNavigate(Vm))
-            {
-                var preloadValue = await Vm.ImageIterator?.GetNextPreLoadValueAsync();
-                Vm.SecondaryImageSource = preloadValue?.ImageModel.Image;
-                WindowHelper.SetSize(Vm.ImageWidth, Vm.ImageHeight, preloadValue.ImageModel.PixelWidth, preloadValue.ImageModel.PixelHeight, Vm.RotationAngle, Vm);
-            }
-        }
-        await SettingsHelper.SaveSettingsAsync();
+        await UIHelper.ShowSideBySide(Vm);
     }
 
     public static async Task Reload()