diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-12-16 07:04:12 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-12-16 07:04:12 +0000 |
| commit | 948d4af7a72a3687ada8a768729a1d2a5f3ca2aa (patch) | |
| tree | a2a36dafec85b6607f9ab37f87a09416bf18955e | |
| parent | a37694ff33006b85262cddf81116397f2049ce9c (diff) | |
Fixed track list track moving/resizing.
| -rw-r--r-- | muse2/ChangeLog | 2 | ||||
| -rw-r--r-- | muse2/muse/arranger/tlist.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index cb802763..04f78f8a 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,3 +1,5 @@ +16.12.2010: + - Fixed track list track moving/resizing - added ev->buttons() check to mouseMoveEvent(). (Tim) 15.12.2010: - Major cleanup in the #includes. Emptied all.ha nnd moved its contents to individual files. The build is roughly 20% faster now. (Orcan) diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 97992bfe..64e5ef63 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -765,7 +765,7 @@ void TList::mousePressEvent(QMouseEvent* ev) int x = ev->x(); int y = ev->y(); int button = ev->button(); - bool shift = ev->modifiers() & Qt::ShiftModifier; + bool shift = ((QInputEvent*)ev)->modifiers() & Qt::ShiftModifier; Track* t = y2Track(y + ypos); @@ -946,7 +946,7 @@ void TList::mousePressEvent(QMouseEvent* ev) break; case COL_MUTE: // p3.3.29 - if ((button == Qt::RightButton) || (ev->modifiers() & Qt::ControlModifier)) + if ((button == Qt::RightButton) || (((QInputEvent*)ev)->modifiers() & Qt::ControlModifier)) t->setOff(!t->off()); else { @@ -1127,7 +1127,7 @@ void TList::selectTrackBelow() void TList::mouseMoveEvent(QMouseEvent* ev) { - if (ev->modifiers() == 0) { + if ((((QInputEvent*)ev)->modifiers() | ev->buttons()) == 0) { int y = ev->y(); int ty = -ypos; TrackList* tracks = song->tracks(); @@ -1252,7 +1252,7 @@ void TList::wheelEvent(QWheelEvent* ev) break; case COL_MUTE: // p3.3.29 - if (ev->modifiers() & Qt::ControlModifier) + if (((QInputEvent*)ev)->modifiers() & Qt::ControlModifier) t->setOff(!t->off()); else { |