From 9cb8f7a62812de0213a33615f1296644a8d58c0f Mon Sep 17 00:00:00 2001 From: "U-COMTROL_US\\mattm" Date: Tue, 26 Feb 2019 09:22:21 -0600 Subject: [PATCH] Use Ctrl instead of Shift for zoom modifier in timeline --- ui/timelinewidget.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp index 7651ddd81..0a5f76aa3 100644 --- a/ui/timelinewidget.cpp +++ b/ui/timelinewidget.cpp @@ -360,8 +360,8 @@ void TimelineWidget::dragMoveEvent(QDragMoveEvent *event) { } void TimelineWidget::wheelEvent(QWheelEvent *event) { - // shift used to toggle zooming instead of scrolling - bool shift = (event->modifiers() & Qt::ShiftModifier); + // ctrl used to toggle zooming instead of scrolling + bool ctrl = (event->modifiers() & Qt::ControlModifier); // // NOTE/FIXME: CURRENTLY disabling pixel scrolling because it needs more testing @@ -384,9 +384,9 @@ void TimelineWidget::wheelEvent(QWheelEvent *event) { int scroll_amount = alt ? (event->angleDelta().x()) : (event->angleDelta().y()); bool in = (scroll_amount > 0); - if (olive::CurrentConfig.scroll_zooms != shift) { + if (olive::CurrentConfig.scroll_zooms != ctrl) { - // if config.scroll_zooms is enabled or shift is held, zoom instead of scrolling + // if config.scroll_zooms is enabled or ctrl is held, zoom instead of scrolling if (in) { panel_timeline->multiply_zoom(1.5); } else {