Merge pull request #4317 from OpenShot/fix-zoom

Allow mousewheel zoom on webengine

Author: JacksonRG

src/timeline/js/directives/ruler.js

@@ -45,6 +45,23 @@ App.directive("tlScrollableTracks", function () {
     restrict: "A",
     link: function (scope, element, attrs) {
 
+      /**
+       * if ctrl is held, scroll in or out.
+       * Implimentation copied from zoomSlider zoomIn zoomOut
+       */
+      element.on("wheel",function (e) {
+        if (e.ctrlKey) {
+          e.preventDefault(); // Don't scroll like a browser
+          if (e.originalEvent.deltaY > 0) { // Scroll down: Zoom out
+            /*global timeline*/
+            timeline.zoomOut();
+          } else { // Scroll Up: Zoom in
+            /*global timeline*/
+            timeline.zoomIn();
+          }
+        }
+      });
+
       // Sync ruler to track scrolling
       element.on("scroll", function () {
         //set amount scrolled

src/windows/views/webview.py

@@ -2745,6 +2745,14 @@ def qt_log(self, level="INFO", message=None):
             level = levels.get(level, logging.INFO)
         self.log_fn(level, message)
 
+    @pyqtSlot()
+    def zoomIn(self):
+        get_app().window.sliderZoomWidget.zoomIn()
+
+    @pyqtSlot()
+    def zoomOut(self):
+        get_app().window.sliderZoomWidget.zoomOut()
+
     def update_scroll(self, newScroll):
         """Force a scroll event on the timeline (i.e. the zoom slider is moving, so we need to scroll the timeline)"""
         # Get access to timeline scope and set scale to new computed value
@@ -2776,20 +2784,6 @@ def update_zoom(self, newScale):
             get_app().updates.update(["scale"], newScale)
             get_app().updates.ignore_history = False
 
-    # Capture wheel event to alter zoom slider control
-    def wheelEvent(self, event):
-        if event.modifiers() & Qt.ControlModifier:
-            event.accept()
-
-            # Modify zooms factor
-            if event.angleDelta().y() > 0:
-                get_app().window.sliderZoomWidget.zoomIn()
-            else:
-                get_app().window.sliderZoomWidget.zoomOut()
-
-        else:
-            super().wheelEvent(event)
-
     # An item is being dragged onto the timeline (mouse is entering the timeline now)
     def dragEnterEvent(self, event):