Improve file history navigation

Ruben2776 · Nov 21, 2023 · 768d68f · 768d68f
1 parent 8541bfe
commit 768d68f
Showing 1 changed file with 36 additions and 3 deletions.
diff --git a/src/PicView/ChangeImage/FileHistory.cs b/src/PicView/ChangeImage/FileHistory.cs
@@ -199,11 +199,28 @@ internal async Task NextAsync()
             else
             {
                 index++;
-                if (index >= MaxCount) return;
+                if (index >= MaxCount)
+                    return;
             }
 
-            if (_fileHistory[index] == Navigation.Pics[Navigation.FolderIndex])
+            if (Navigation.Pics.Contains(_fileHistory[index]))
             {
+                if (_fileHistory[index] == Navigation.Pics[Navigation.FolderIndex])
+                {
+                    return;
+                }
+                // If the gallery is open, deselect current index
+                if (UC.GetPicGallery is not null)
+                {
+                    await UC.GetPicGallery.Dispatcher.InvokeAsync(() =>
+                    {
+                        UC.GetPicGallery.Scroller.CanContentScroll = true; // Disable animations
+                        // Deselect current item
+                        GalleryNavigation.SetSelected(GalleryNavigation.SelectedGalleryItem, false);
+                        GalleryNavigation.SetSelected(Navigation.FolderIndex, false);
+                    });
+                }
+                await LoadPic.LoadPicAtIndexAsync(Navigation.Pics.IndexOf(_fileHistory[index])).ConfigureAwait(false);
                 return;
             }
 
@@ -232,8 +249,24 @@ internal async Task PrevAsync()
                 }
             }
 
-            if (_fileHistory[index] == Navigation.Pics[Navigation.FolderIndex])
+            if (Navigation.Pics.Contains(_fileHistory[index]))
             {
+                if (_fileHistory[index] == Navigation.Pics[Navigation.FolderIndex])
+                {
+                    return;
+                }
+                // If the gallery is open, deselect current index
+                if (UC.GetPicGallery is not null)
+                {
+                    await UC.GetPicGallery.Dispatcher.InvokeAsync(() =>
+                    {
+                        UC.GetPicGallery.Scroller.CanContentScroll = true; // Disable animations
+                        // Deselect current item
+                        GalleryNavigation.SetSelected(GalleryNavigation.SelectedGalleryItem, false);
+                        GalleryNavigation.SetSelected(Navigation.FolderIndex, false);
+                    });
+                }
+                await LoadPic.LoadPicAtIndexAsync(Navigation.Pics.IndexOf(_fileHistory[index])).ConfigureAwait(false);
                 return;
             }