oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #558 from mdmayfield/master

Browse Source 
Use Ctrl instead of Shift for zoom modifier in timeline
This commit is contained in:
itsmattkc
2019-02-26 10:03:22 -08:00
committed by GitHub
parent c82ef62b13 9cb8f7a628
commit 66ec4aaf75
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/timelinewidget.cpp
+4 -4
View File
@@ -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 {