Moved ImageType.cs to `ImageHandling`

src/PicView.Avalonia/Clipboard/ClipboardHelper.cs

@@ -8,6 +8,7 @@ using Avalonia.Media.Imaging;
 using Avalonia.Platform.Storage;
 using Avalonia.Threading;
 using PicView.Avalonia.Animations;
+using PicView.Avalonia.ImageHandling;
 using PicView.Avalonia.Navigation;
 using PicView.Avalonia.UI;
 using PicView.Avalonia.ViewModels;

src/PicView.Avalonia/CustomControls/PicBox.cs

@@ -12,7 +12,7 @@ using Avalonia.Svg.Skia;
 using Avalonia.Utilities;
 using ImageMagick;
 using PicView.Avalonia.AnimatedImage;
-using PicView.Avalonia.Navigation;
+using PicView.Avalonia.ImageHandling;
 using PicView.Avalonia.UI;
 using PicView.Avalonia.ViewModels;
 using PicView.Core.Config;

src/PicView.Avalonia/FileSystem/FileSaverHelper.cs

@@ -1,5 +1,5 @@
 using Avalonia.Media.Imaging;
-using PicView.Avalonia.Navigation;
+using PicView.Avalonia.ImageHandling;
 using PicView.Avalonia.ViewModels;
 using PicView.Core.Config;
 using PicView.Core.ImageDecoding;

src/PicView.Avalonia/Navigation/ImageType.cs → src/PicView.Avalonia/ImageHandling/ImageType.cs

@@ -1,4 +1,4 @@
-namespace PicView.Avalonia.Navigation;
+namespace PicView.Avalonia.ImageHandling;
 
 public enum ImageType
 {

src/PicView.Avalonia/Navigation/QuickLoad.cs

@@ -56,9 +56,12 @@ public static class QuickLoad
             
         SetTitleHelper.SetTitle(vm, imageModel);
         vm.GetIndex = vm.ImageIterator.CurrentIndex + 1;
-        if (SettingsHelper.Settings.WindowProperties.KeepCentered)
+        if (SettingsHelper.Settings.WindowProperties.KeepCentered || SettingsHelper.Settings.WindowProperties.AutoFit)
         {
-            WindowHelper.CenterWindowOnScreen(false);
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                WindowHelper.CenterWindowOnScreen();
+            }, DispatcherPriority.Send);
         }
 
         if (SettingsHelper.Settings.UIProperties.IsTaskbarProgressEnabled)

src/PicView.Avalonia/ViewModels/MainViewModel.cs

@@ -8,6 +8,7 @@ using Avalonia.Media;
 using PicView.Avalonia.Clipboard;
 using PicView.Avalonia.Converters;
 using PicView.Avalonia.Gallery;
+using PicView.Avalonia.ImageHandling;
 using PicView.Avalonia.Interfaces;
 using PicView.Avalonia.Navigation;
 using PicView.Avalonia.UI;

src/PicView.Core/Config/SettingsHelper.cs

@@ -5,13 +5,13 @@ using System.Text.Json.Serialization;
 
 namespace PicView.Core.Config;
 
-[JsonSourceGenerationOptions(AllowTrailingCommas = true)]
+[JsonSourceGenerationOptions(AllowTrailingCommas = true, WriteIndented = true)]
 [JsonSerializable(typeof(AppSettings))]
 internal partial class SourceGenerationContext : JsonSerializerContext;
 
 public static class SettingsHelper
 {
-    private const double CurrentSettingsVersion = 1;
+    private const double CurrentSettingsVersion = 1.1;
     private const string ConfigPath = "Config/UserSettings.json";
     private const string RoamingConfigPath = "Ruben2776/PicView/Config/UserSettings.json";