Fix transitions not appearing in timeline because QPropertyAnimation seems broken...

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index fe3aa518e7c265bbb993e780ea97f5adebadcdb6..a43a8ce8c1beff1c1db562020c4bbc6cc07f61de 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -29,6 +29,7 @@
 #include <QDomElement>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
+#include <QPropertyAnimation>
 
 
 Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
@@ -43,14 +44,20 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
     setPos(info.startPos.frames(fps), (int)(info.track * KdenliveSettings::trackheight() + itemOffset() + 1));
 
 #if QT_VERSION >= 0x040600
-    m_startAnimation = new QPropertyAnimation(this, "rect");
-    m_startAnimation->setDuration(200);
-    QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2);
-    QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());
-    m_startAnimation->setStartValue(r);
-    m_startAnimation->setEndValue(r2);
-    m_startAnimation->setEasingCurve(QEasingCurve::OutQuad);
-    m_startAnimation->start();
+    if (!(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects)) {
+        // animation disabled
+        setRect(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight());
+    }
+    else {
+        QPropertyAnimation *startAnimation = new QPropertyAnimation(this, "rect");
+        startAnimation->setDuration(200);
+        QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2);
+        QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());
+        startAnimation->setStartValue(r);
+        startAnimation->setEndValue(r2);
+        startAnimation->setEasingCurve(QEasingCurve::OutQuad);
+        startAnimation->start(QAbstractAnimation::DeleteWhenStopped);
+    }
 #else
     setRect(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight());
 #endif
@@ -79,9 +86,6 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
 Transition::~Transition()
 {
     blockSignals(true);
-#if QT_VERSION >= 0x040600
-    delete m_startAnimation;
-#endif
     if (scene()) scene()->removeItem(this);
 }