Set mouse wheel navigation to when shift is held down if scrolling be…

…havior is enabled
Ruben2776 · Mar 24, 2023 · ae8c3e9 · ae8c3e9
1 parent 36670e8
commit ae8c3e9
Showing 1 changed file with 9 additions and 44 deletions.
diff --git a/PicView/Shortcuts/MainMouseKeys.cs b/PicView/Shortcuts/MainMouseKeys.cs
@@ -239,41 +239,9 @@ private static async Task HandleFullscreenGalleryAsync(bool direction, MouseWhee
             {
                 await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(DispatcherPriority.Normal, () => GalleryNavigation.ScrollTo(direction, false, true));
             }
-            else if ((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control)
-            {
-                if (Settings.Default.CtrlZoom)
-                {
-                    await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(DispatcherPriority.Normal, () => Zoom(e.Delta > 0));
-                }
-                else
-                {
-                    if (direction)
-                    {
-                        await Navigation.GoToNextImage(NavigateTo.Previous).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        await Navigation.GoToNextImage(NavigateTo.Next).ConfigureAwait(false);
-                    }
-                }
-            }
             else
             {
-                if (Settings.Default.CtrlZoom)
-                {
-                    if (direction)
-                    {
-                        await Navigation.GoToNextImage(NavigateTo.Previous).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        await Navigation.GoToNextImage(NavigateTo.Next).ConfigureAwait(false);
-                    }
-                }
-                else
-                {
-                    await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(DispatcherPriority.Normal, () => Zoom(e.Delta > 0));
-                }
+                await HandleNavigateOrZoomAsync(direction, e).ConfigureAwait(false);
             }
         }
 
@@ -293,6 +261,7 @@ private static void HandleScroll(bool direction)
 
         private static async Task HandleNavigateOrZoomAsync(bool direction, MouseWheelEventArgs e)
         {
+            var next = direction ? NavigateTo.Previous : NavigateTo.Next;
             if ((Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control)
             {
                 if (Settings.Default.CtrlZoom)
@@ -301,27 +270,23 @@ private static async Task HandleNavigateOrZoomAsync(bool direction, MouseWheelEv
                 }
                 else
                 {
-                    if (direction)
-                    {
-                        await Navigation.GoToNextImage(NavigateTo.Previous).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        await Navigation.GoToNextImage(NavigateTo.Next).ConfigureAwait(false);
-                    }
+                    await Navigation.GoToNextImage(next).ConfigureAwait(false);
                 }
             }
             else
             {
                 if (Settings.Default.CtrlZoom)
                 {
-                    if (direction)
+                    if (Properties.Settings.Default.ScrollEnabled)
                     {
-                        await Navigation.GoToNextImage(NavigateTo.Previous).ConfigureAwait(false);
+                        if ((Keyboard.Modifiers & ModifierKeys.Shift) == ModifierKeys.Shift)
+                        {
+                            await Navigation.GoToNextImage(next).ConfigureAwait(false);
+                        }
                     }
                     else
                     {
-                        await Navigation.GoToNextImage(NavigateTo.Next).ConfigureAwait(false);
+                        await Navigation.GoToNextImage(next).ConfigureAwait(false);
                     }
                 }
                 else