Allow retrieval of metadata created by Magic Lantern for canon cams

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index f10befc4537d01daabc2e52a708a02848f08d265..7ac3a2233a024ace288807b9d49d1f4d2c7a92b7 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -168,11 +168,12 @@ void Transition::paint(QPainter *painter,
     const QRectF mapped = painter->worldTransform().mapRect(br);
 
     QPointF p1(br.x(), br.y() + br.height() / 2 - 7);
-    painter->setWorldMatrixEnabled(false);
+    painter->setWorldTransform(QTransform());
     QPainterPath p;
     p.addRect(exposed);
+    
     QPainterPath q;
-    q.addRoundedRect(mapped.adjusted(0, 0, -1, -1), 3, 3);
+    q.addRoundedRect(mapped, 3, 3);
     painter->setClipPath(p.intersected(q));
     painter->fillRect(exposed, brush());
     const QString text = m_name + (m_forceTransitionTrack ? "|>" : QString());
@@ -188,7 +189,7 @@ void Transition::paint(QPainter *painter,
 
     const QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + text + ' ');
     painter->setBrush(framePen.color());
-    painter->setPen(Qt::NoPen);
+    painter->setPen(framePen.color());
     painter->drawRoundedRect(txtBounding, 3, 3);
     painter->setBrush(QBrush(Qt::NoBrush));
 
@@ -223,6 +224,11 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
         int newTrack = newPos.y() / KdenliveSettings::trackheight();
         newTrack = qMin(newTrack, projectScene()->tracksCount() - 1);
         newTrack = qMax(newTrack, 0);
+       QStringList lockedTracks = property("locked_tracks").toStringList();
+       if (lockedTracks.contains(QString::number(newTrack))) {
+           // Trying to move to a locked track
+           return pos();
+       }
         newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1));
         // Only one clip is moving
         QRectF sceneShape = rect();