USe free

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index 12519ea90e148cb155afd4f3ef490a7a6528a68e..ecdd7086ac2c1b9179e6089cba53f432527257bc 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -37,7 +37,6 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
         AbstractClipItem(info, QRectF(), fps),
         m_forceTransitionTrack(false),
         m_automaticTransition(automaticTransition),
-        m_secondClip(NULL),
         m_transitionTrack(transitiontrack)
 {
     setZValue(3);
@@ -79,9 +78,6 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
     else if (m_parameters.attribute("automatic") == "1") m_automaticTransition = true;
     if (m_parameters.attribute("force_track") == "1") m_forceTransitionTrack = true;
     m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
-    m_secondClip = 0;
-
-    //m_referenceClip->addTransition(this);
 }
 
 Transition::~Transition()
@@ -161,22 +157,27 @@ void Transition::paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
                        QWidget */*widget*/)
 {
-    const QRectF exposed = option->exposedRect;
-    painter->setClipRect(exposed);
+    const QRectF exposed = painter->worldTransform().mapRect(option->exposedRect);
     const QRectF br = rect();
     QPen framePen;
+    framePen.setWidthF(1.2);
     const QRectF mapped = painter->worldTransform().mapRect(br);
 
-    painter->fillRect(exposed, brush());
-
     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, 3, 3);
+    painter->setClipPath(p.intersected(q));
+    painter->fillRect(exposed, brush());
     const QString text = m_name + (m_forceTransitionTrack ? "|>" : QString());
 
     // Draw clip name
     if (isSelected() || (parentItem() && parentItem()->isSelected())) {
-        framePen.setColor(Qt::red);
-        framePen.setWidthF(2.0);
+        framePen.setColor(scene()->palette().highlight().color());
+       framePen.setColor(Qt::red);
     }
     else {
         framePen.setColor(brush().color().darker());
@@ -184,7 +185,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));
 
@@ -194,7 +195,8 @@ void Transition::paint(QPainter *painter,
     // Draw frame
     painter->setPen(framePen);
     painter->setClipping(false);
-    painter->drawRect(mapped.adjusted(0, 0, -0.5, -0.5));
+    painter->setRenderHint(QPainter::Antialiasing, true);
+    painter->drawRoundedRect(mapped.adjusted(0, 0, -0.5, -0.5), 3, 3);
 }
 
 int Transition::type() const
@@ -218,6 +220,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();
@@ -307,27 +314,6 @@ int Transition::itemOffset()
     return (int) (KdenliveSettings::trackheight() / 3 * 2);
 }
 
-bool Transition::hasClip(const ClipItem * clip) const
-{
-    if (clip == m_secondClip) return true;
-    return false;
-}
-
-bool Transition::belongsToClip(const ClipItem * clip) const
-{
-    if (clip == m_referenceClip) return true;
-    return false;
-}
-
-/*
-Transition *Transition::clone() {
-    return new Transition::Transition(rect(), m_referenceClip, toXML() , m_fps);
-}*/
-
-const ClipItem *Transition::referencedClip() const
-{
-    return m_referenceClip;
-}
 
 QDomElement Transition::toXML()
 {
@@ -339,11 +325,6 @@ QDomElement Transition::toXML()
     m_parameters.setAttribute("end", endPos().frames(m_fps));
     m_parameters.setAttribute("force_track", m_forceTransitionTrack);
     m_parameters.setAttribute("automatic", m_automaticTransition);
-
-    if (m_secondClip) {
-        m_parameters.setAttribute("clipb_starttime", m_secondClip->startPos().frames(m_referenceClip->fps()));
-        m_parameters.setAttribute("clipb_track", transitionEndTrack());
-    }
     return m_parameters.cloneNode().toElement();
 }
 
@@ -362,7 +343,7 @@ int Transition::defaultZValue() const
     return 3;
 }
 
-bool Transition::updateKeyframes()
+bool Transition::updateKeyframes(int oldEnd)
 {
     QString keyframes;
     QDomElement pa;
@@ -377,20 +358,41 @@ bool Transition::updateKeyframes()
     }
     if (keyframes.isEmpty()) return false;
     int duration = cropDuration().frames(m_fps) - 1;
-    QStringList values = keyframes.split(";");
+    QStringList values = keyframes.split(';');
     int frame;
     int i = 0;
-    foreach(const QString &pos, values) {
-        if (!pos.contains('=')) {
-            i++;
-            continue;
-        }
-        frame = pos.section('=', 0, 0).toInt();
-        if (frame > duration) {
-            modified = true;
-            break;
-        }
-        i++;
+    if (oldEnd < duration) {
+       // Transition was expanded, check if we had a keyframe at end position
+       foreach(QString pos, values) {
+           if (!pos.contains('=')) {
+               i++;
+               continue;
+           }
+           frame = pos.section('=', 0, 0).toInt();
+           if (frame == oldEnd) {
+               // Move that keyframe to new end
+                values[i] = QString::number(duration) + '=' + pos.section('=', 1);
+               pa.setAttribute("value", values.join(";"));
+               return true;
+           }
+           i++;
+       }
+       return false;
+    }
+    else {
+       // Transition was shortened, check for out of bounds keyframes
+       foreach(const QString &pos, values) {
+           if (!pos.contains('=')) {
+               i++;
+               continue;
+           }
+           frame = pos.section('=', 0, 0).toInt();
+           if (frame > duration) {
+               modified = true;
+               break;
+           }
+           i++;
+       }
     }
     if (modified) {
         if (i > 0) {