summaryrefslogtreecommitdiff
path: root/muse2/muse/arranger/pcanvas.cpp
diff options
context:
space:
mode:
authorOrcan Ogetbil <oget.fedora@gmail.com>2010-12-28 21:52:36 +0000
committerOrcan Ogetbil <oget.fedora@gmail.com>2010-12-28 21:52:36 +0000
commit6a5d00dea2201ac85d7bbae030cbc8abb8a97618 (patch)
tree84f3cc6d4b1ebbf08e8e4f419d1ea6421eb16c26 /muse2/muse/arranger/pcanvas.cpp
parent3b82893a939c5aa22642a5c72392881412cfe080 (diff)
fixed shift modifier issue when renaming parts.
Diffstat (limited to 'muse2/muse/arranger/pcanvas.cpp')
-rw-r--r--muse2/muse/arranger/pcanvas.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 714e9a16..984d6eaa 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -1065,9 +1065,19 @@ Track* PartCanvas::y2Track(int y) const
void PartCanvas::keyPress(QKeyEvent* event)
{
int key = event->key();
- if (editMode) {
- returnPressed();
- return;
+ if (editMode)
+ {
+ if ( key == Qt::Key_Return || key == Qt::Key_Enter )
+ {
+ returnPressed();
+ return;
+ }
+ else if ( key == Qt::Key_Escape )
+ {
+ lineEditor->hide();
+ editMode = false;
+ return;
+ }
}
if (event->modifiers() & Qt::ShiftModifier)