[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/16.08] src/timeline: Fix Ctrl+Shift selection, rolling edit is now on Ctrl cl
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-08-31 21:24:08
Message-ID: E1bfCzQ-00039P-Cf () code ! kde ! org
[Download RAW message or body]

Git commit 773605cd94321112bbf718cb142b02bdd0beb713 by Jean-Baptiste Mardelle.
Committed on 31/08/2016 at 20:57.
Pushed by mardelle into branch 'Applications/16.08'.

Fix Ctrl+Shift selection, rolling edit is now on Ctrl click
CCBUG: 368053

M  +1    -1    src/timeline/customtrackview.cpp
M  +1    -1    src/timeline/managers/selectmanager.cpp

http://commits.kde.org/kdenlive/773605cd94321112bbf718cb142b02bdd0beb713

diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index d2603a3..e393e10 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -1148,7 +1148,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 
     if (m_operationMode == ResizeEnd || m_operationMode == ResizeStart) {
         // Start Ripple edit
-        if (event->modifiers() & Qt::ControlModifier && event->modifiers() & Qt::ShiftModifier) {
+        if (event->modifiers() == Qt::ControlModifier) {
             // Rolling edit
             if (!m_toolManagers.value(TrimType)->mousePress(m_dragItemInfo)) {
                 event->ignore();
diff --git a/src/timeline/managers/selectmanager.cpp b/src/timeline/managers/selectmanager.cpp
index 9d80f39..2d90900 100644
--- a/src/timeline/managers/selectmanager.cpp
+++ b/src/timeline/managers/selectmanager.cpp
@@ -39,7 +39,7 @@ bool SelectManager::mousePress(ItemInfo info, Qt::KeyboardModifiers modifiers, Q
 {
     Q_UNUSED(info);
     m_modifiers = modifiers;
-    if (m_modifiers == Qt::ShiftModifier) {
+    if (m_modifiers & Qt::ShiftModifier) {
         m_view->createRectangleSelection(modifiers);
         return true;
     }

[prev in list] [next in list] [prev in thread] [next in thread]