Fix timeline handling of objects (move them instead of changing their bounding rect

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index 4def181804a3cfdd68806c6b2fdd1d494650add0..2e163439a9a098fbeaa7112af735c30702007e5f 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <QBrush>
-#include <qdom.h>
+#include <QDomElement>
 #include <QPainter>
 #include <QGraphicsScene>
 #include <QGraphicsView>
@@ -32,7 +32,10 @@
 #include "kdenlivesettings.h"
 #include "mainwindow.h"
 
-Transition::Transition(const ItemInfo info, int transitiontrack, double scale, double fps, QDomElement params) : AbstractClipItem(info, QRectF(info.startPos.frames(fps) *scale , info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2, (info.endPos - info.startPos).frames(fps) * scale , KdenliveSettings::trackheight() / 3 * 2 - 1), fps) {
+Transition::Transition(const ItemInfo info, int transitiontrack, double scale, double fps, QDomElement params) : AbstractClipItem(info, QRectF(), fps), m_gradient(QLinearGradient(0, 0, 0, 0)) {
+    setRect(0, 0, (qreal)(info.endPos - info.startPos).frames(fps) * scale - .5, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
+    setPos((qreal) info.startPos.frames(fps) * scale, (qreal)(info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2));
+
     m_singleClip = true;
     m_transitionTrack = transitiontrack;
     m_secondClip = NULL;
@@ -60,6 +63,12 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double scale, d
 Transition::~Transition() {
 }
 
+Transition *Transition::clone(double scale) {
+    QDomElement xml = toXML().cloneNode().toElement();
+    Transition *tr = new Transition(info(), transitionEndTrack(), scale, m_fps, xml);
+    return tr;
+}
+
 QString Transition::transitionName() const {
     return m_name;
 }
@@ -71,6 +80,7 @@ QString Transition::transitionTag() const {
 void Transition::setTransitionParameters(const QDomElement params) {
     m_parameters = params;
     m_name = m_parameters.elementsByTagName("name").item(0).toElement().text();
+    update();
 }
 
 
@@ -108,18 +118,13 @@ void Transition::updateTransitionEndTrack(int newtrack) {
 void Transition::paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
                        QWidget *widget) {
-    QRect rectInView = visibleRect();//this is the rect that is visible by the user
 
-    if (rectInView.isNull())
-        return;
-    QPainterPath clippath;
-    clippath.addRect(rectInView);
+    painter->setClipRect(option->exposedRect);
     QRectF br = rect();
     QPainterPath roundRectPathUpper = upperRectPart(br), roundRectPathLower = lowerRectPart(br);
-
     QPainterPath resultClipPath = roundRectPathUpper.united(roundRectPathLower);
 
-    painter->setClipPath(resultClipPath.intersected(clippath), Qt::IntersectClip);
+
 #if 0
     QRadialGradient radialGrad(QPointF(br.x() + 50, br.y() + 20), 70);
     radialGrad.setColorAt(0, QColor(200, 200, 0, 100));
@@ -129,12 +134,11 @@ void Transition::paint(QPainter *painter,
 #else
     m_gradient.setStart(0, br.y());
     m_gradient.setFinalStop(0, br.bottom());
-    painter->fillRect(br.intersected(rectInView), m_gradient);
+    painter->fillPath(resultClipPath, m_gradient);
 #endif
-    painter->setClipRect(option->exposedRect);
+
     int top = (int)(br.y() + br.height() / 2 - 7);
     painter->drawPixmap((int)(br.x() + 10), top, transitionPixmap());
-    painter->drawPath(resultClipPath.intersected(clippath));
     painter->setPen(QColor(0, 0, 0, 180));
     top += painter->fontInfo().pixelSize();
     painter->drawText((int)br.x() + 31, top + 1, transitionName());
@@ -149,8 +153,7 @@ void Transition::paint(QPainter *painter,
         //pen.setWidth(1);
     }
     painter->setPen(pen);
-    painter->setClipRect(option->exposedRect);
-    painter->drawPath(resultClipPath.intersected(clippath));
+    painter->drawPath(resultClipPath);
 }
 
 int Transition::type() const {
@@ -158,8 +161,9 @@ int Transition::type() const {
 }
 
 OPERATIONTYPE Transition::operationMode(QPointF pos, double scale) {
-    if (qAbs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
-    else if (qAbs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
+    QRectF rect = sceneBoundingRect();
+    if (qAbs((int)(pos.x() - rect.x())) < 6) return RESIZESTART;
+    else if (qAbs((int)(pos.x() - (rect.right()))) < 6) return RESIZEEND;
     return MOVE;
 }