From 0b92f5893e8f2b204d8637cb601723ea4f9321f1 Mon Sep 17 00:00:00 2001
From: Jeremy Bullock <jcbullock@gmail.com>
Date: Sep 07 2017 07:13:47 +0000
Subject: Fix for scrubbing shortcuts (#1378)


* new shortcuts are;
ctrl + shift + drag = next/prev frames
ctrl + shift + scroll = next/prev frames
alt + shift + scroll = next/prev drawings
ctrl + shift + alt = next/prev step
---

diff --git a/toonz/sources/tnztools/brushtool.cpp b/toonz/sources/tnztools/brushtool.cpp
index dac975a..1ed2812 100644
--- a/toonz/sources/tnztools/brushtool.cpp
+++ b/toonz/sources/tnztools/brushtool.cpp
@@ -1936,7 +1936,7 @@ void BrushTool::mouseMove(const TPointD &pos, const TMouseEvent &e) {
   // locals.addMinMax(
   //  TToonzImageP(getImage(false, 1)) ? m_rasThickness : m_thickness, add);
   //} else
-  if (e.isCtrlPressed() && e.isAltPressed()) {
+  if (e.isCtrlPressed() && e.isAltPressed() && !e.isShiftPressed()) {
     const TPointD &diff = pos - m_mousePos;
     double max          = diff.x / 2;
     double min          = diff.y / 2;
diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp
index bbbd51e..cfa9f79 100644
--- a/toonz/sources/toonz/sceneviewerevents.cpp
+++ b/toonz/sources/toonz/sceneviewerevents.cpp
@@ -490,7 +490,7 @@ void SceneViewer::onMove(const TMouseEvent &event) {
   } else if (m_mouseButton == Qt::MidButton) {
     if ((event.buttons() & Qt::MidButton) == 0) m_mouseButton = Qt::NoButton;
     // scrub with shift and middle click
-    else if (event.isShiftPressed()) {
+    else if (event.isShiftPressed() && event.isCtrlPressed()) {
       if (curPos.x() > m_pos.x()) {
         CommandManager::instance()->execute("MI_NextFrame");
       } else if (curPos.x() < m_pos.x()) {
@@ -728,7 +728,10 @@ void SceneViewer::wheelEvent(QWheelEvent *event) {
   int delta = 0;
   switch (event->source()) {
   case Qt::MouseEventNotSynthesized: {
-    delta = event->angleDelta().y();
+    if (event->modifiers() & Qt::AltModifier)
+      delta = event->angleDelta().x();
+    else
+      delta = event->angleDelta().y();
     break;
   }
 
@@ -757,20 +760,23 @@ void SceneViewer::wheelEvent(QWheelEvent *event) {
 
   if (abs(delta) > 0) {
     // scrub with mouse wheel
-    if ((event->modifiers() & Qt::ControlModifier) &&
-        (event->modifiers() & Qt::ShiftModifier)) {
+    if ((event->modifiers() & Qt::AltModifier) &&
+        (event->modifiers() & Qt::ShiftModifier) &&
+        (event->modifiers() & Qt::ControlModifier)) {
       if (delta < 0) {
         CommandManager::instance()->execute("MI_NextStep");
       } else if (delta > 0) {
         CommandManager::instance()->execute("MI_PrevStep");
       }
-    } else if (event->modifiers() & Qt::ShiftModifier) {
+    } else if ((event->modifiers() & Qt::ControlModifier) &&
+               (event->modifiers() & Qt::ShiftModifier)) {
       if (delta < 0) {
         CommandManager::instance()->execute("MI_NextFrame");
       } else if (delta > 0) {
         CommandManager::instance()->execute("MI_PrevFrame");
       }
-    } else if (event->modifiers() & Qt::ControlModifier) {
+    } else if ((event->modifiers() & Qt::ShiftModifier) &&
+               (event->modifiers() & Qt::AltModifier)) {
       if (delta < 0) {
         CommandManager::instance()->execute("MI_NextDrawing");
       } else if (delta > 0) {