Fix incorrect size at startup when loading fullscreen gallery and the…

… image is set to be stretched. Fixed fullscreen gallery loading inconsistencies, fixed a problem where the number of image gallery items exceeded the actual number of images

PicView/ImageHandling/Thumbnails.cs

@@ -18,37 +18,37 @@ internal static class Thumbnails
     internal static BitmapSource? GetThumb(int x, FileInfo? fileInfo = null)
     {
         BitmapSource? pic;
-
-        if (GetPicGallery != null && GetPicGallery.Container.Children.Count > 0 && x < GetPicGallery.Container.Children.Count)
-        {
-            var y = GetPicGallery.Container.Children[x] as PicGalleryItem;
-            pic = (BitmapSource)y.ThumbImage.Source;
-        }
-        else
+        try
         {
-            if (fileInfo is null)
+            if (GetPicGallery != null && GetPicGallery.Container.Children.Count > 0 && x < GetPicGallery.Container.Children.Count)
             {
-                var preLoadValue = PreLoader.Get(x);
-                if (preLoadValue is null)
-                {
-                    fileInfo = new FileInfo(Pics[x]);
-                }
-                else
-                {
-                    return preLoadValue.BitmapSource;
-                }
+                var y = GetPicGallery.Container.Children[x] as PicGalleryItem;
+                pic = (BitmapSource)y.ThumbImage.Source;
             }
-            try
+            else
             {
+                if (fileInfo is null)
+                {
+                    var preLoadValue = PreLoader.Get(x);
+                    if (preLoadValue is null)
+                    {
+                        fileInfo = new FileInfo(Pics[x]);
+                    }
+                    else
+                    {
+                        return preLoadValue.BitmapSource;
+                    }
+                }
+
                 using var image = new MagickImage();
                 image.Ping(fileInfo);
                 var thumb = image.GetExifProfile()?.CreateThumbnail();
                 pic = thumb?.ToBitmapSource();
             }
-            catch (Exception)
-            {
-                return null;
-            }
+        }
+        catch (Exception)
+        {
+            return null;
         }
 
         if (pic is { IsFrozen: false })

PicView/PicGallery/GalleryClick.cs

@@ -25,7 +25,7 @@ internal static class GalleryClick
 {
     internal static async Task ClickAsync(int id)
     {
-        if (GalleryFunctions.IsGalleryOpen == false)
+        if (Settings.Default.FullscreenGallery)
         {
             await ItemClickAsync(id).ConfigureAwait(false);
             return;

PicView/PicGallery/GalleryLoad.cs

@@ -117,21 +117,21 @@ internal static async Task LoadAsync()
     {
         IsLoading = true;
         var source = new CancellationTokenSource();
-        var task = Task.Run(() => LoopAsync(source.Token), source.Token);
         try
         {
-            await task.ConfigureAwait(false);
-            IsLoading = false;
+            await LoopAsync(source.Token).ConfigureAwait(false);
         }
         catch (TaskCanceledException)
         {
-            ConfigureWindows.GetMainWindow.Dispatcher.Invoke(DispatcherPriority.Background, new Action(async () =>
-            {
-                UC.GetPicGallery.Container.Children.Clear();
-                await LoadAsync().ConfigureAwait(false); // restart when changing directory
-            }));
+            ConfigureWindows.GetMainWindow.Dispatcher.Invoke(DispatcherPriority.Background,
+                new Action(() => { UC.GetPicGallery.Container.Children.Clear(); }));
+            await LoadAsync().ConfigureAwait(false);
+        }
+        finally
+        {
+            IsLoading = false;
+            source.Dispose();
         }
-        finally { source.Dispose(); }
     }
 
     private static async Task LoopAsync(CancellationToken cancellationToken)
@@ -141,7 +141,7 @@ private static async Task LoopAsync(CancellationToken cancellationToken)
         var count = Navigation.Pics.Count;
         var index = Navigation.FolderIndex;
 
-        for (var i = 0; i < count; i++)
+        for (int i = 0; i < count; i++)
         {
             if (count != Navigation.Pics.Count)
             {
@@ -151,19 +151,17 @@ private static async Task LoopAsync(CancellationToken cancellationToken)
             Add(i, index);
         }
 
-        for (var i = 0; i < count; i++)
+        await Parallel.ForEachAsync(Navigation.Pics, cancellationToken, async (item, token) =>
         {
             if (count != Navigation.Pics.Count)
             {
                 throw new TaskCanceledException();
             }
-
-            Add(i, index);
-        }
-
-        Parallel.For(0, count, i =>
-        {
-            _ = UpdatePic(i).ConfigureAwait(false);
+            if (cancellationToken.IsCancellationRequested)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+            }
+            await UpdatePic(item).ConfigureAwait(false);
         });
     }
 
@@ -186,7 +184,7 @@ internal static void Add(int i, int index)
         }));
     }
 
-    private static async Task UpdatePic(int i)
+    private static async Task UpdatePic(string file)
     {
         if (Navigation.Pics?.Count < Navigation.FolderIndex || Navigation.Pics?.Count < 1)
         {
@@ -195,8 +193,8 @@ private static async Task UpdatePic(int i)
             return;
         }
 
-        var source = await Task.FromResult(Thumbnails.GetBitmapSourceThumb(new FileInfo(Navigation.Pics[i]), (int)GalleryNavigation.PicGalleryItemSize));
-        UpdatePic(i, source);
+        var source = await Task.FromResult(Thumbnails.GetBitmapSourceThumb(new FileInfo(file), (int)GalleryNavigation.PicGalleryItemSize));
+        UpdatePic(Navigation.Pics.IndexOf(file), source);
     }
 
     internal static void UpdatePic(int i, BitmapSource? pic)

PicView/PicGallery/GalleryNavigation.cs

@@ -216,11 +216,11 @@ internal static void HorizontalNavigation(Direction direction)
 
     internal static void FullscreenGalleryNavigation()
     {
+        SetSelected(FolderIndex, true);
+        SelectedGalleryItem = FolderIndex;
+
         ConfigureWindows.GetMainWindow.Dispatcher.Invoke(() =>
         {
-            SetSelected(FolderIndex, true);
-            SelectedGalleryItem = FolderIndex;
-
             if (Settings.Default.FullscreenGallery)
             {
                 GetPicGallery.Scroller.ScrollToHorizontalOffset(CenterScrollPosition);
@@ -229,9 +229,9 @@ internal static void FullscreenGalleryNavigation()
             {
                 GetPicGallery.Scroller.ScrollToVerticalOffset(CenterScrollPosition);
             }
-
-            Tooltip.CloseToolTipMessage();
         });
+
+        Tooltip.CloseToolTipMessage();
     }
 
     #endregion Horizontal Gallery Navigation

PicView/PicGallery/GalleryToggle.cs

@@ -49,13 +49,8 @@ internal static async Task OpenHorizontalGalleryAsync()
         await LoadAndScrollToAsync().ConfigureAwait(false);
     }
 
-    internal static async Task OpenFullscreenGalleryAsync(bool startup)
+    internal static async Task OpenFullscreenGalleryAsync()
     {
-        if (Pics?.Count < 1 && !startup)
-        {
-            return;
-        }
-
         await GetMainWindow.Dispatcher.BeginInvoke(DispatcherPriority.Normal, () =>
         {
             GalleryLoad.LoadLayout();
@@ -93,11 +88,7 @@ internal static async Task OpenFullscreenGalleryAsync(bool startup)
             GetPicGallery.Opacity = GetPicGallery.Container.Opacity = 1;
         });
 
-        if (startup == false)
-        {
-            ScaleImage.TryFitImage();
-        }
-
+        ScaleImage.TryFitImage();
         await LoadAndScrollToAsync().ConfigureAwait(false);
     }
 

PicView/UILogic/Sizing/ScaleImage.cs

@@ -76,7 +76,7 @@ internal static void FitImage(double width, double height)
         double maxWidth, maxHeight;
         var margin = 0d;
         var padding = MonitorInfo.DpiScaling <= 1 ? 20 * MonitorInfo.DpiScaling : 0; // Padding to make it feel more comfortable
-        var isFullScreenSize = Settings.Default is { Fullscreen: true, FullscreenGallery: true };
+        var isFullScreenSize = Settings.Default.Fullscreen || Settings.Default.FullscreenGallery;
 
         var borderSpaceHeight = isFullScreenSize ? 0 : GetMainWindow.LowerBar.Height + GetMainWindow.TitleBar.Height;
         var borderSpaceWidth = Settings.Default.Fullscreen ? 0 : padding;

PicView/Views/UserControls/Gallery/PicGallery.xaml

@@ -21,9 +21,11 @@
                 Panel.ZIndex="1" />
             <ScrollViewer
                 x:Name="Scroller"
+                CanContentScroll="False"
                 FocusVisualStyle="{x:Null}"
                 Focusable="False"
-                HorizontalScrollBarVisibility="Visible"
+                HorizontalScrollBarVisibility="Visible" 
+                IsDeferredScrollingEnabled="False"
                 VerticalScrollBarVisibility="Disabled">
                 <ScrollViewer.Style>
                     <Style TargetType="{x:Type ScrollViewer}">

PicView/Views/UserControls/Gallery/PicGallery.xaml.cs

@@ -6,7 +6,7 @@ namespace PicView.Views.UserControls.Gallery;
 /// <summary>
 /// Interaction logic for PicGallery.xaml
 /// </summary>
-public partial class PicGallery : UserControl
+public partial class PicGallery
 {
     public PicGallery()
     {

PicView/Views/UserControls/Menus/ImageSettings.xaml.cs

@@ -77,7 +77,7 @@ public ImageSettings()
                 Settings.Default.FullscreenGallery = true;
             }
 
-            await GalleryToggle.OpenFullscreenGalleryAsync(false).ConfigureAwait(false);
+            await GalleryToggle.OpenFullscreenGalleryAsync().ConfigureAwait(false);
         };
         FullScreenGalleryButton.Click += async delegate
         {
@@ -88,7 +88,7 @@ public ImageSettings()
                 Settings.Default.FullscreenGallery = true;
             }
 
-            await GalleryToggle.OpenFullscreenGalleryAsync(false).ConfigureAwait(false);
+            await GalleryToggle.OpenFullscreenGalleryAsync().ConfigureAwait(false);
         };
 
         // ContainedGalleryBorder

PicView/Views/Windows/MainWindow.xaml.cs

@@ -70,7 +70,7 @@ public MainWindow()
             //     w.TitleBar.Background = (ImageBrush) Application.Current.Resources["NoisyBg"];
             //     w.LowerBar.Background = (ImageBrush) Application.Current.Resources["NoisyBg"];
             // }
-            Task.Run(() =>
+            Task.Run(async() =>
             {
                 var args = Environment.GetCommandLineArgs();
 
@@ -83,7 +83,8 @@ public MainWindow()
                     }
                     else
                     {
-                        _ = GalleryToggle.OpenFullscreenGalleryAsync(true).ConfigureAwait(false);
+                        ConfigureWindows.GetMainWindow.Dispatcher.Invoke(GalleryLoad.LoadLayout, DispatcherPriority.Send);
+                        await GalleryToggle.OpenFullscreenGalleryAsync().ConfigureAwait(false);
                     }
                 }
                 else if (Settings.Default.Fullscreen)
@@ -105,7 +106,7 @@ public MainWindow()
                 }
                 else
                 {
-                    _ = QuickLoad.QuickLoadAsync(args[1]).ConfigureAwait(false);
+                    await QuickLoad.QuickLoadAsync(args[1]).ConfigureAwait(false);
                     // TODO maybe load extra images if multiple arguments
                 }
             });