Merge pull request #553 from Jethro-Alter/Image_Zoom

Mouse wheel for zoom; Double click to reset zoom
QL-Win · Oct 9, 2019 · 7b2b6b2 · 7b2b6b2
2 parents 42f109b + 1f198f1
commit 7b2b6b2
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/ImagePanel.xaml.cs
@@ -79,6 +79,7 @@ public ImagePanel()
             viewPanel.PreviewMouseWheel += ViewPanel_PreviewMouseWheel;
             viewPanel.MouseLeftButtonDown += ViewPanel_MouseLeftButtonDown;
             viewPanel.MouseMove += ViewPanel_MouseMove;
+            viewPanel.MouseDoubleClick += ViewPanel_MouseDoubleClick;
 
             viewPanel.ManipulationInertiaStarting += ViewPanel_ManipulationInertiaStarting;
             viewPanel.ManipulationStarting += ViewPanel_ManipulationStarting;
@@ -341,6 +342,11 @@ private void ViewPanel_MouseLeftButtonDown(object sender, MouseButtonEventArgs e
             _dragInitPos = temp;
         }
 
+        private void ViewPanel_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            DoZoomToFit();
+        }
+
         private void ViewPanel_MouseMove(object sender, MouseEventArgs e)
         {
             if (!_dragInitPos.HasValue)
@@ -366,16 +372,6 @@ private void ViewPanel_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
         {
             e.Handled = true;
 
-            if ((Keyboard.Modifiers & ModifierKeys.Control) == 0)
-            {
-                // normal scroll
-                viewPanel.ScrollToVerticalOffset(viewPanel.VerticalOffset - e.Delta);
-
-                ImageScrolled?.Invoke(this, e.Delta);
-
-                return;
-            }
-
             // zoom
             var newZoom = ZoomFactor + ZoomFactor * e.Delta / 120 * 0.1;