Size calculation update for setting padding

src/PicView.Avalonia.MacOS/App.axaml.cs

@@ -232,7 +232,7 @@ public class App : Application, IPlatformSpecificService, IPlatformWindowService
     
     #endregion
     
-    public int Padding { get; set; } // TODO should be the width or height of the dock. Half if auto-hiding
+    public double Padding { get; set; } // TODO should be the width or height of the dock. Half if auto-hiding
 
     public int CombinedTitleButtonsWidth { get; set; } = 165;
     

src/PicView.Avalonia.Win32/App.axaml.cs

@@ -9,6 +9,7 @@ using PicView.Avalonia.ColorManagement;
 using PicView.Avalonia.Interfaces;
 using PicView.Avalonia.Navigation;
 using PicView.Avalonia.StartUp;
+using PicView.Avalonia.UI;
 using PicView.Avalonia.ViewModels;
 using PicView.Avalonia.Win32.Views;
 using PicView.Avalonia.Win32.WindowImpl;
@@ -88,10 +89,19 @@ public class App : Application, IPlatformSpecificService, IPlatformWindowService
 #endif
         }
     }
-    
-    public int Padding { get; set; } = 45;
 
-    public int CombinedTitleButtonsWidth { get; set; } = 215;
+    public double Padding
+    {
+        get => Settings.WindowProperties.Padding / ScreenHelper.ScreenSize.Scaling;
+    }
+
+    public int CombinedTitleButtonsWidth
+    {
+        get => (int)(Settings.WindowProperties.Maximized && !Settings.WindowProperties.Fullscreen
+            ? _mainWindow?.OffScreenMargin.Left + _mainWindow?.OffScreenMargin.Right + field ?? field
+            : field);
+        set;
+    } = 215;
 
     #region Interface Implementations
     

src/PicView.Avalonia/Interfaces/IPlatformWindowService.cs

@@ -5,7 +5,7 @@ public interface IPlatformWindowService
     /// <summary>
     /// Gets or sets the padding used to calculate space between the screen and the window.
     /// </summary>
-    int Padding { get; set; }
+    double Padding { get; }
 
     /// <summary>
     /// Gets or sets the width of the buttons on the respective title bar implementation.

src/PicView.Avalonia/StartUp/StartUpHelper.cs

@@ -89,9 +89,16 @@ public static class StartUpHelper
 
     public static void HandleWindowScalingMode(MainViewModel vm, Window window)
     {
+        ScreenHelper.UpdateScreenSize(window);
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+        {
+            if (Settings.WindowProperties.Padding <= 0)
+            {
+                Settings.WindowProperties.Padding = 45;
+            }
+        }
         if (Settings.WindowProperties.AutoFit)
         {
-            ScreenHelper.UpdateScreenSize(window);
             HandleAutoFit(vm, window);
         }
         else
@@ -361,7 +368,7 @@ public static class StartUpHelper
         vm.IsAutoFit  = Settings.WindowProperties.AutoFit;
         vm.IsStayingCentered  = Settings.WindowProperties.KeepCentered;
         vm.IsOpeningInSameWindow  = Settings.UIProperties.OpenInSameWindow;
-        vm.IsShowingConfirmationOnEsc  = Settings.UIProperties.ShowConfirmationOnEsc;
+        vm.IsShowingConfirmationOnEsc  = Settings.UIProperties.ShowConfirmationOnEsc;   
         vm.IsUsingTouchpad  = Settings.Zoom.IsUsingTouchPad;
         vm.IsAscending  = Settings.Sorting.Ascending;
         vm.BackgroundChoice = Settings.UIProperties.BgColorChoice;

src/PicView.Avalonia/UI/ScreenHelper.cs

@@ -1,5 +1,4 @@
-using System.Runtime.InteropServices;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using PicView.Core.Sizing;
 
 namespace PicView.Avalonia.UI;
@@ -33,10 +32,6 @@ public static class ScreenHelper
         // Need to lock it to prevent multiple calls
         lock (Lock)
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                // TODO: Get macOS dock size
-            }
             var screen = window.Screens.ScreenFromVisual(window);
         
             var monitorWidth = screen.WorkingArea.Width / screen.Scaling;

src/PicView.Avalonia/Views/StartUpMenu.axaml.cs

@@ -127,7 +127,7 @@ public partial class StartUpMenu : UserControl
         }
 
         var titleMaxWidth = ImageSizeCalculationHelper.GetTitleMaxWidth(vm.RotationAngle, width, height,
-            desktop.MainWindow.MinWidth, desktop.MainWindow.MinHeight, ImageSizeCalculationHelper.GetInterfaceSize(),
+            desktop.MainWindow.MinWidth, desktop.MainWindow.MinHeight, vm.PlatformWindowService.CombinedTitleButtonsWidth,
             desktop.MainWindow.Width);
 
         if (Settings.Zoom.ScrollEnabled)

src/PicView.Avalonia/WindowBehavior/WindowResizing.cs

@@ -226,6 +226,7 @@ public static class WindowResizing
         if (Settings.ImageScaling.ShowImageSideBySide && secondWidth > 0 && secondHeight > 0)
         {
             size = ImageSizeCalculationHelper.GetSideBySideImageSize(
+                vm.PlatformWindowService.Padding,
                 width,
                 height,
                 secondWidth,
@@ -233,7 +234,7 @@ public static class WindowResizing
                 screenSize,
                 desktopMinWidth,
                 desktopMinHeight,
-                ImageSizeCalculationHelper.GetInterfaceSize(),
+                vm.PlatformWindowService.CombinedTitleButtonsWidth,
                 rotation,
                 screenSize.Scaling,
                 vm.TitlebarHeight,
@@ -245,12 +246,13 @@ public static class WindowResizing
         else
         {
             size = ImageSizeCalculationHelper.GetImageSize(
+                vm.PlatformWindowService.Padding,
                 width,
                 height,
                 screenSize,
                 desktopMinWidth,
                 desktopMinHeight,
-                ImageSizeCalculationHelper.GetInterfaceSize(),
+                vm.PlatformWindowService.CombinedTitleButtonsWidth,
                 rotation,
                 screenSize.Scaling,
                 vm.TitlebarHeight,

src/PicView.Core/Config/AppSettings.cs

@@ -2,7 +2,7 @@
 
 public class AppSettings
 {
-    public double Version { get; set; } = 1.4;
+    public double Version { get; set; } = SettingsConfiguration.CurrentSettingsVersion;
     public WindowProperties? WindowProperties { get; set; }
     public UIProperties? UIProperties { get; set; }
     public Theme? Theme { get; set; }
@@ -24,6 +24,7 @@ public class WindowProperties
     public bool Maximized { get; set; } = false;
     public bool Fullscreen { get; set; } = false;
     public bool KeepCentered { get; set; } = false;
+    public double Padding { get; set; } = 0;
 }
 
 public class UIProperties

src/PicView.Core/Config/SettingsConfiguration.cs

@@ -2,7 +2,7 @@
 
 public static class SettingsConfiguration
 {
-    public const double CurrentSettingsVersion = 1.3;
+    public const double CurrentSettingsVersion = 1.5;
     
     public const string ConfigFileName = "UserSettings.json";
     public const string LocalConfigFilePath = "Config/" + ConfigFileName;

src/PicView.Core/Sizing/ImageSizeCalculationHelper.cs

@@ -1,28 +1,12 @@
-using System.Runtime.InteropServices;
-
-namespace PicView.Core.Sizing;
+namespace PicView.Core.Sizing;
 
 public static class ImageSizeCalculationHelper
 {
     private const int MinTitleWidth = 250;
-    private const int Padding = 45;
-    
-    /// <summary>
-    ///  Returns the interface size of the titlebar based on OS
-    /// </summary>
-    public static double GetInterfaceSize()
-    {
-        // TODO: find a more elegant solution
-        return RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? 165 : 215;
-    }
     
-    public static double GetWindowMargin()
-    {
-        // TODO: find a more elegant solution
-        return RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? 7 : 0;
-    }
-
-    public static ImageSize GetImageSize(double width,
+    public static ImageSize GetImageSize(
+        double padding,
+        double width,
         double height,
         ScreenSize screenSize,
         double minWidth,
@@ -49,7 +33,7 @@ public static class ImageSizeCalculationHelper
                          Settings.WindowProperties.Maximized;
             
         var borderSpaceHeight = fullscreen ? 0 : uiTopSize + uiBottomSize + galleryHeight;
-        var borderSpaceWidth = fullscreen ? 0 : Padding;
+        var borderSpaceWidth = fullscreen ? 0 : padding;
 
         var workAreaWidth = screenSize.WorkingAreaWidth - borderSpaceWidth;
         var workAreaHeight = screenSize.WorkingAreaHeight - borderSpaceHeight;
@@ -61,19 +45,19 @@ public static class ImageSizeCalculationHelper
 
             maxWidth = Settings.ImageScaling.StretchImage 
                 ? workAreaWidth 
-                : Math.Min(workAreaWidth - Padding, width);
+                : Math.Min(workAreaWidth - padding, width);
             
             maxHeight = workAreaHeight;
         }
         else if (Settings.WindowProperties.AutoFit)
         {
             maxWidth = Settings.ImageScaling.StretchImage
-                ? workAreaWidth - Padding
-                : Math.Min(workAreaWidth - Padding, width);
+                ? workAreaWidth - padding
+                : Math.Min(workAreaWidth - padding, width);
                     
             maxHeight = Settings.ImageScaling.StretchImage
-                ? workAreaHeight - Padding
-                : Math.Min(workAreaHeight - Padding, height);
+                ? workAreaHeight - padding
+                : Math.Min(workAreaHeight - padding, height);
         }
         else
         {
@@ -146,7 +130,7 @@ public static class ImageSizeCalculationHelper
                 xWidth = width * aspectRatio;
                 xHeight = height * aspectRatio;
 
-                scrollWidth = Math.Max(xWidth + SizeDefaults.ScrollbarSize, SizeDefaults.WindowMinSize + SizeDefaults.ScrollbarSize + Padding + 16);
+                scrollWidth = Math.Max(xWidth + SizeDefaults.ScrollbarSize, SizeDefaults.WindowMinSize + SizeDefaults.ScrollbarSize + padding + 16);
                 scrollHeight = containerHeight - margin;
             }
             else
@@ -173,7 +157,9 @@ public static class ImageSizeCalculationHelper
         return new ImageSize(xWidth, xHeight, 0, scrollWidth, scrollHeight, titleMaxWidth, margin, aspectRatio);
     }
 
-    public static ImageSize GetSideBySideImageSize(double width,
+    public static ImageSize GetSideBySideImageSize(
+        double padding,
+        double width,
         double height,
         double secondaryWidth,
         double secondaryHeight,
@@ -196,11 +182,11 @@ public static class ImageSizeCalculationHelper
         }
 
         // Get sizes for both images
-        var firstSize = GetImageSize(width, height, screenSize, minWidth, minHeight,
+        var firstSize = GetImageSize(padding, width, height, screenSize, minWidth, minHeight,
             interfaceSize, rotationAngle, dpiScaling, uiTopSize, uiBottomSize, galleryHeight,
             containerWidth,
             containerHeight);
-        var secondSize = GetImageSize(secondaryWidth, secondaryHeight, screenSize, minWidth,
+        var secondSize = GetImageSize(padding, secondaryWidth, secondaryHeight, screenSize, minWidth,
             minHeight, interfaceSize, rotationAngle, dpiScaling, uiTopSize, uiBottomSize,
             galleryHeight,
             containerWidth, containerHeight);
@@ -217,7 +203,7 @@ public static class ImageSizeCalculationHelper
 
         if (Settings.WindowProperties.AutoFit)
         {
-            var widthPadding = Settings.ImageScaling.StretchImage ? 4 : Padding;
+            var widthPadding = Settings.ImageScaling.StretchImage ? 4 : padding;
             var availableWidth = screenSize.WorkingAreaWidth - widthPadding;
             var availableHeight = screenSize.WorkingAreaHeight - (widthPadding + uiBottomSize + uiTopSize);
             if (rotationAngle is 0 or 180)
@@ -288,7 +274,7 @@ public static class ImageSizeCalculationHelper
                 var borderSpaceHeight = fullscreen ? 0 : uiTopSize + uiBottomSize + galleryHeight;
                 var workAreaHeight = screenSize.WorkingAreaHeight * dpiScaling - borderSpaceHeight;
                 scrollHeight = Math.Min(xHeight,
-                    Settings.ImageScaling.StretchImage ? workAreaHeight : workAreaHeight - Padding);
+                    Settings.ImageScaling.StretchImage ? workAreaHeight : workAreaHeight - padding);
             }
             else
             {
@@ -344,10 +330,6 @@ public static class ImageSizeCalculationHelper
         }
         else
         {
-            if (Settings.WindowProperties.Maximized)
-            {
-                interfaceSize += GetWindowMargin() * 2;
-            }
             // Fix title width to window size
             titleMaxWidth = containerWidth - interfaceSize;
         }