From 1b62bea8393afed2cd509c7f72f72787b6bf54e7 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sun, 14 Dec 2008 11:10:21 +0000 Subject: [PATCH] fixed ctrl+mousewheel zooming in on piano roll git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1922 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 1 + TODO | 1 - src/gui/piano_roll.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d96ed66b7..6e625dc8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ - note volume bars are painted blue if selected - dragging around a note in the piano roll makes the correct volume and panning noises + - fixed Ctrl+Scroll to zoom in * include/panning.h: added panningToMidi function to easily convert panning to a midi value diff --git a/TODO b/TODO index c9988fb98..0c09a6226 100644 --- a/TODO +++ b/TODO @@ -52,7 +52,6 @@ - add FLAC as export-format? Andrew Kelley's todo: -- fix ctrl+mousewheel zooming in - if you press both controls at the same time, the piano roll gets stuck in selection mode - change my modifier code to use mainwindows modifier info - multiview button - show notes from every instrument in the current beat+bassline with different colors diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index bf6ea383f..b0370ec75 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -2761,7 +2761,7 @@ void pianoRoll::resizeEvent( QResizeEvent * ) void pianoRoll::wheelEvent( QWheelEvent * _we ) { _we->accept(); - if( engine::getMainWindow()->isCtrlPressed() == true ) + if( _we->modifiers() & Qt::ControlModifier ) { if( _we->delta() > 0 ) {