diff options
Diffstat (limited to 'muse2/muse/arranger/tlist.cpp')
-rw-r--r-- | muse2/muse/arranger/tlist.cpp | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index e9ed1a88..887a80f9 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -655,11 +655,23 @@ void TList::tracklistChanged() void TList::keyPressEvent(QKeyEvent* e) { - if (editMode && ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter)) { + if (editMode) + { // First time we get a keypress event when lineedit is open is on the return key: // -- Not true for Qt4. Modifier keys also send key events - Orcan - returnPressed(); - return; + if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) + { + returnPressed(); + return; + } + else if ( e->key() == Qt::Key_Escape ) + { + editor->hide(); + editTrack = 0; + editMode = false; + setFocus(); + return; + } } emit keyPressExt(e); //redirect keypress events to main app e->ignore(); |