فهرست منبع

Fix title max width on startupmenu

Ruben 7 ماه پیش
والد
کامیت
f9e6e33a7d
2فایلهای تغییر یافته به همراه12 افزوده شده و 5 حذف شده
  1. 2 4
      src/PicView.Avalonia/StartUp/StartUpHelper.cs
  2. 10 1
      src/PicView.Avalonia/Views/StartUpMenu.axaml.cs

+ 2 - 4
src/PicView.Avalonia/StartUp/StartUpHelper.cs

@@ -178,8 +178,7 @@ public static class StartUpHelper
         {
             if (string.IsNullOrWhiteSpace(Settings.StartUp.LastFile))
             {
-                vm.CurrentView = new StartUpMenu();
-                vm.IsLoading = false;
+                ErrorHandling.ShowStartUpMenu(vm);
             }
             else
             {
@@ -189,8 +188,7 @@ public static class StartUpHelper
         }
         else
         {
-            vm.CurrentView = new StartUpMenu();
-            vm.IsLoading = false;
+            ErrorHandling.ShowStartUpMenu(vm);
         }
     }
 

+ 10 - 1
src/PicView.Avalonia/Views/StartUpMenu.axaml.cs

@@ -126,9 +126,18 @@ public partial class StartUpMenu : UserControl
                 break;
         }
 
-        vm.TitleMaxWidth = ImageSizeCalculationHelper.GetTitleMaxWidth(vm.RotationAngle, width, height,
+        var titleMaxWidth = ImageSizeCalculationHelper.GetTitleMaxWidth(vm.RotationAngle, width, height,
             desktop.MainWindow.MinWidth, desktop.MainWindow.MinHeight, ImageSizeCalculationHelper.GetInterfaceSize(),
             desktop.MainWindow.Width);
+
+        if (Settings.Zoom.ScrollEnabled)
+        {
+            vm.TitleMaxWidth = titleMaxWidth - SizeDefaults.ScrollbarSize;
+        }
+        else
+        {
+            vm.TitleMaxWidth = titleMaxWidth;
+        }
         
         return;