Merge pull request #4119 from JacksonRG/right-click-bug

SHIFT + Right click bug preventing clip/transition movement

Author: JacksonRG

.gitignore

@@ -9,3 +9,4 @@ dist
 openshot_qt.egg-info
 
 protobuf_data/
+openshot_qt/

src/timeline/app.js

@@ -57,25 +57,6 @@ $(document).ready(function () {
     $(".playhead-line").height(body_object.scope().playhead_height);
   });
 
-  // Bind to keydown event (to detect SHIFT)
-  body_object.keydown(function (event) {
-    if (event.which === 16) {
-      if (timeline) {
-        timeline.qt_log("DEBUG", "Shift pressed!");
-      }
-      body_object.scope().shift_pressed = true;
-    }
-  });
-
-  body_object.keyup(function (event) {
-    if (event.which === 16) {
-      if (timeline) {
-        timeline.qt_log("DEBUG", "Shift released!");
-      }
-      body_object.scope().shift_pressed = false;
-    }
-  });
-
   // Manually trigger the window resize code (to verify it runs at least once)
   $(window).trigger("resize");
 });

src/timeline/js/controllers.js

@@ -59,7 +59,6 @@ App.controller("TimelineCtrl", function ($scope) {
   $scope.playhead_animating = false;
   $scope.playhead_height = 300;
   $scope.playheadTime = secondsToTime($scope.project.playhead_position, $scope.project.fps.num, $scope.project.fps.den);
-  $scope.shift_pressed = false;
   $scope.snapline_position = 0.0;
   $scope.snapline = false;
   $scope.enable_snapping = true;

src/timeline/js/functions.js

@@ -273,7 +273,7 @@ function moveBoundingBox(scope, previous_x, previous_y, x_offset, y_offset, left
   snapping_result.top = top;
 
   // Check for shift key
-  if (scope.shift_pressed) {
+  if (event.shiftKey) {
     // freeze X movement
     x_offset = 0;
     snapping_result.left = previous_x;