Git commit 773605cd94321112bbf718cb142b02bdd0beb713 by Jean-Baptiste Mardel=
le.
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/customtrackvie=
w.cpp
index d2603a3..e393e10 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -1148,7 +1148,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * e=
vent)
 =

     if (m_operationMode =3D=3D ResizeEnd || m_operationMode =3D=3D ResizeS=
tart) {
         // Start Ripple edit
-        if (event->modifiers() & Qt::ControlModifier && event->modifiers()=
 & Qt::ShiftModifier) {
+        if (event->modifiers() =3D=3D 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/manager=
s/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::Keyboar=
dModifiers modifiers, Q
 {
     Q_UNUSED(info);
     m_modifiers =3D modifiers;
-    if (m_modifiers =3D=3D Qt::ShiftModifier) {
+    if (m_modifiers & Qt::ShiftModifier) {
         m_view->createRectangleSelection(modifiers);
         return true;
     }