JS: Separate Ctrl, Shift responses to scroll/zoom (OpenShot#4492)

bonnibell · Nov 9, 2021 · 58f9962 · 58f9962
1 parent 12d85a9
commit 58f9962
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/timeline/js/directives/ruler.js b/src/timeline/js/directives/ruler.js
@@ -52,15 +52,16 @@ App.directive("tlScrollableTracks", function () {
       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
+          var delta = e.originalEvent.deltaY * (e.shiftKey ? -1 : 1);
+          if (delta > 0) { // Scroll down: Zoom out
             /*global timeline*/
             timeline.zoomOut();
           } else { // Scroll Up: Zoom in
             /*global timeline*/
             timeline.zoomIn();
           }
         }
-        if (e.shiftKey) {
+        else if (e.shiftKey) {
           let current_scroll = $("#scrolling_tracks").scrollLeft()
           $("#scrolling_tracks").scrollLeft(current_scroll + e.originalEvent.deltaY);
         }