Fix zooming with Ctrl-MouseWheel.

andrejkatin · Jan 3, 2021 · 478c2f1 · 478c2f1
1 parent a441389
commit 478c2f1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 34 deletions.
diff --git a/Pinta.Gui.Widgets/Widgets/Canvas/CanvasWindow.cs b/Pinta.Gui.Widgets/Widgets/Canvas/CanvasWindow.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using Gdk;
 using Gtk;
 using Pinta.Core;
 using Pinta.Gui.Widgets;
@@ -34,6 +35,7 @@ namespace Pinta
 {
 	public class CanvasWindow : Grid
 	{
+		private Document document;
 		private Ruler horizontal_ruler;
 		private Ruler vertical_ruler;
 		private ScrolledWindow scrolled_window;
@@ -43,6 +45,8 @@ public class CanvasWindow : Grid
 
 		public CanvasWindow (Document document)
 		{
+			this.document = document;
+
 			Build (document);
 
 			scrolled_window.Hadjustment.ValueChanged += UpdateRulerRange;
@@ -136,6 +140,8 @@ private void Build (Document document)
 				ShadowType = ShadowType.None
 			};
 
+			vp.ScrollEvent += ViewPort_ScrollEvent;
+
 			Canvas = new PintaCanvas (this, document) {
 				Name = "canvas",
 				CanDefault = true,
@@ -170,5 +176,18 @@ private void Build (Document document)
 			horizontal_ruler.Visible = false;
 			vertical_ruler.Visible = false;
 		}
+
+		private void ViewPort_ScrollEvent (object o, ScrollEventArgs args)
+		{
+			// Allow the user to zoom in/out with Ctrl-Mousewheel
+			if (args.Event.State.IsControlPressed () && args.Event.Direction == ScrollDirection.Smooth) {
+				if (args.Event.DeltaX > 0 || args.Event.DeltaY < 0)
+					document.Workspace.ZoomInFromMouseScroll (new Cairo.PointD (args.Event.X, args.Event.Y));
+				else if (args.Event.DeltaX < 0 || args.Event.DeltaY > 0)
+					document.Workspace.ZoomOutFromMouseScroll (new Cairo.PointD (args.Event.X, args.Event.Y));
+
+				args.RetVal = true;
+			}
+		}
 	}
 }
diff --git a/Pinta.Gui.Widgets/Widgets/Canvas/PintaCanvas.cs b/Pinta.Gui.Widgets/Widgets/Canvas/PintaCanvas.cs
@@ -37,7 +37,6 @@ public class PintaCanvas : DrawingArea
 		private readonly Document document;
 
 		private Cairo.ImageSurface? canvas;
-		private int h_scroll_amount = 92;
 
 		public CanvasWindow CanvasWindow { get; private set; }
 
@@ -159,39 +158,6 @@ protected override bool OnDrawn (Cairo.Context context)
 			return true;
 		}
 
-		protected override bool OnScrollEvent (EventScroll evnt)
-		{
-			// Allow the user to zoom in/out with Ctrl-Mousewheel
-			if (evnt.State.FilterModifierKeys () == ModifierType.ControlMask) {
-				switch (evnt.Direction) {
-					case ScrollDirection.Down:
-					case ScrollDirection.Right:
-						document.Workspace.ZoomOutFromMouseScroll (new Cairo.PointD (evnt.X, evnt.Y));
-						return true;
-					case ScrollDirection.Left:
-					case ScrollDirection.Up:
-						document.Workspace.ZoomInFromMouseScroll (new Cairo.PointD (evnt.X, evnt.Y));
-						return true;
-				}
-			}
-
-			// Allow the user to scroll left/right with Shift-Mousewheel
-			if (evnt.State.FilterModifierKeys () == ModifierType.ShiftMask) {
-				switch (evnt.Direction) {
-					case ScrollDirection.Down:
-					case ScrollDirection.Right:
-						document.Workspace.ScrollCanvas (h_scroll_amount, 0);
-						return true;
-					case ScrollDirection.Up:
-					case ScrollDirection.Left:
-						document.Workspace.ScrollCanvas (-h_scroll_amount, 0);
-						return true;
-				}
-			}
-
-			return base.OnScrollEvent (evnt);
-		}
-
 		private void SetRequisition (Size size)
 		{
 			WidthRequest = size.Width;