From f4ac7ea28914dec7b659ae39373f02c5a177aa4b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 17 Nov 2012 10:54:56 +0100 Subject: [PATCH] Fix right click in timeline: http://kdenlive.org/mantis/view.php?id=2829 --- src/customtrackview.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index acc7f26e..b1b0bb63 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -859,14 +859,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) // context menu requested if (event->button() == Qt::RightButton) { - if (m_dragItem) { - if (dragGroup) dragGroup->setSelected(true); - else if (!m_dragItem->isSelected()) { - resetSelectionGroup(false); - m_scene->clearSelection(); - m_dragItem->setSelected(true); - } - } else if (!m_dragGuide) { + if (!m_dragItem && !m_dragGuide) { // check if there is a guide close to mouse click QList guidesCollisionList = items(event->pos().x() - 5, event->pos().y(), 10, 2); // a rect of height < 2 does not always collide with the guide for (int i = 0; i < guidesCollisionList.count(); i++) { @@ -886,9 +879,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_operationMode = NONE; displayContextMenu(event->globalPos(), m_dragItem, dragGroup); m_menuPosition = m_clickEvent; - m_dragItem = NULL; - event->accept(); - return; } // No item under click @@ -965,7 +955,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) updateSnapPoints(NULL, cleandOffsetList, true); } m_operationMode = SPACER; - } else { + } else if (event->button() != Qt::RightButton) { setCursor(Qt::ArrowCursor); seekCursorPos((int)(mapToScene(event->x(), 0).x())); } -- 2.39.2