From 4e3072137b5cb58fc987fa5e53c8797c1608ef13 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Wed, 18 Aug 2010 23:55:04 +0200 Subject: [PATCH] PianoRoll: fixed messed up editing modes when pressing Ctrl There were some bugs when pressing Ctrl while in SelectMode. Fix this by always setting m_ctrlMode and m_editMode in keyPressEvent() when Ctrl was pressed. Closes #2854958 and #2836576. (cherry picked from commit 46c20bdcbdbf7ae66f1f584ab547201eadb10773) --- src/gui/piano_roll.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index 12b726c4b5..b97d70a828 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -1177,14 +1177,10 @@ void pianoRoll::keyPressEvent( QKeyEvent * _ke ) } case Qt::Key_Control: - if( m_editMode != ModeSelect ) - { - m_ctrlMode = m_editMode; - m_editMode = ModeSelect; - QApplication::changeOverrideCursor( - QCursor( Qt::ArrowCursor ) ); - update(); - } + m_ctrlMode = m_editMode; + m_editMode = ModeSelect; + QApplication::changeOverrideCursor( Qt::ArrowCursor ); + update(); break; default: _ke->ignore();