use clipitem resize also for transition resize

svn path=/branches/KDE4/; revision=2042

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index f8920aec2d95e6cfc2dfef50b48524021c7ccbe3..9c87d3a62c4656bf2f1f06d14b88e974a0960a04 100644 (file)
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -57,11 +57,53 @@ GenTime AbstractClipItem::cropStart() const {
 }
 
 void AbstractClipItem::resizeStart(int posx, double scale) {
-
+    GenTime durationDiff = GenTime(posx, m_fps) - m_startPos;
+    if (durationDiff == GenTime()) return;
+    //kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff;
+    if (m_cropStart + durationDiff < GenTime()) {
+        durationDiff = GenTime() - m_cropStart;
+    } else if (durationDiff >= m_cropDuration) {
+        durationDiff = m_cropDuration - GenTime(3, m_fps);
+    }
+    m_startPos += durationDiff;
+    m_cropStart += durationDiff;
+    m_cropDuration = m_cropDuration - durationDiff;
+    setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height());
+    QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
+    for (int i = 0; i < collisionList.size(); ++i) {
+        QGraphicsItem *item = collisionList.at(i);
+        if (item->type() == type()) {
+            GenTime diff = ((AbstractClipItem *)item)->endPos() + GenTime(1, m_fps) - m_startPos;
+            setRect((m_startPos + diff).frames(m_fps) * scale, rect().y(), (m_cropDuration - diff).frames(m_fps) * scale, rect().height());
+            m_startPos += diff;
+            m_cropStart += diff;
+            m_cropDuration = m_cropDuration - diff;
+            break;
+        }
+    }
 }
 
 void AbstractClipItem::resizeEnd(int posx, double scale) {
-
+    GenTime durationDiff = GenTime(posx, m_fps) - endPos();
+    if (durationDiff == GenTime()) return;
+    //kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff;
+    if (m_cropDuration + durationDiff <= GenTime()) {
+        durationDiff = GenTime() - (m_cropDuration - GenTime(3, m_fps));
+    } else if (m_cropStart + m_cropDuration + durationDiff >= m_maxDuration) {
+        durationDiff = m_maxDuration - m_cropDuration - m_cropStart;
+    }
+    m_cropDuration += durationDiff;
+    setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height());
+    QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
+    for (int i = 0; i < collisionList.size(); ++i) {
+        QGraphicsItem *item = collisionList.at(i);
+        if (item->type() == type()) {
+            GenTime diff = ((AbstractClipItem *)item)->startPos() - GenTime(1, m_fps) - startPos();
+            m_cropDuration = diff;
+            setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height());
+            break;
+        }
+    }
 }
 
 void AbstractClipItem::setFadeOut(int pos, double scale) {
@@ -95,3 +137,7 @@ int AbstractClipItem::fadeIn() const {
 int AbstractClipItem::fadeOut() const {
     return m_endFade;
 }
+
+GenTime AbstractClipItem::maxDuration() const {
+    return m_maxDuration;
+}

diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h
index c727ca2a82b9c7ac9370cc91e344f2e781a20c9c..6620745b6cdfe4b33193b6fd00c9b2e08cc8d538 100644 (file)
--- a/src/abstractclipitem.h
+++ b/src/abstractclipitem.h
@@ -24,11 +24,13 @@ public:
     virtual double fps() const;
     virtual int fadeIn() const;
     virtual int fadeOut() const;
+    virtual GenTime maxDuration() const;
 protected:
     int m_track;
     GenTime m_cropStart;
     GenTime m_cropDuration;
     GenTime m_startPos;
+    GenTime m_maxDuration;
     double m_fps;
     uint m_startFade;
     uint m_endFade;

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 19413d3076347108c1ad3a504b4c6dfff6105ec8..655dda7036b7a5fa1ef6d7d3b0e9371ec03401cb 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -154,10 +154,6 @@ int ClipItem::clipProducer() {
     return m_producer;
 }
 
-GenTime ClipItem::maxDuration() const {
-    return m_maxDuration;
-}
-
 GenTime ClipItem::cropStart() const {
     return m_cropStart;
 }
@@ -536,54 +532,12 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) {
 }
 
 void ClipItem::resizeStart(int posx, double scale) {
-    GenTime durationDiff = GenTime(posx, m_fps) - m_startPos;
-    if (durationDiff == GenTime()) return;
-    //kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff;
-    if (m_cropStart + durationDiff < GenTime()) {
-        durationDiff = GenTime() - m_cropStart;
-    } else if (durationDiff >= m_cropDuration) {
-        durationDiff = m_cropDuration - GenTime(3, m_fps);
-    }
-    m_startPos += durationDiff;
-    m_cropStart += durationDiff;
-    m_cropDuration = m_cropDuration - durationDiff;
-    setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height());
-    QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
-    for (int i = 0; i < collisionList.size(); ++i) {
-        QGraphicsItem *item = collisionList.at(i);
-        if (item->type() == 70000) {
-            GenTime diff = ((ClipItem *)item)->endPos() + GenTime(1, m_fps) - m_startPos;
-            setRect((m_startPos + diff).frames(m_fps) * scale, rect().y(), (m_cropDuration - diff).frames(m_fps) * scale, rect().height());
-            m_startPos += diff;
-            m_cropStart += diff;
-            m_cropDuration = m_cropDuration - diff;
-            break;
-        }
-    }
+    AbstractClipItem::resizeStart(posx, scale);
     if (m_hasThumbs) startThumbTimer->start(100);
 }
 
 void ClipItem::resizeEnd(int posx, double scale) {
-    GenTime durationDiff = GenTime(posx, m_fps) - endPos();
-    if (durationDiff == GenTime()) return;
-    //kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff;
-    if (m_cropDuration + durationDiff <= GenTime()) {
-        durationDiff = GenTime() - (m_cropDuration - GenTime(3, m_fps));
-    } else if (m_cropStart + m_cropDuration + durationDiff >= m_maxDuration) {
-        durationDiff = m_maxDuration - m_cropDuration - m_cropStart;
-    }
-    m_cropDuration += durationDiff;
-    setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height());
-    QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
-    for (int i = 0; i < collisionList.size(); ++i) {
-        QGraphicsItem *item = collisionList.at(i);
-        if (item->type() == 70000) {
-            GenTime diff = ((ClipItem *)item)->startPos() - GenTime(1, m_fps) - startPos();
-            m_cropDuration = diff;
-            setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height());
-            break;
-        }
-    }
+    AbstractClipItem::resizeEnd(posx, scale);
     if (m_hasThumbs) endThumbTimer->start(100);
 }
 

diff --git a/src/clipitem.h b/src/clipitem.h
index ce6b50c38d6cdb7846f084d70ca1df4513d7391d..bba588b7c130656ca9be1468b444aae698875b36 100644 (file)
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -51,7 +51,7 @@ public:
     int clipType();
     DocClipBase *baseClip();
     QString clipName();
-    GenTime maxDuration() const;
+
     GenTime cropStart() const;
     QDomElement xml() const;
 
@@ -93,7 +93,7 @@ private:
     int m_producer;
     CLIPTYPE m_clipType;
     QString m_clipName;
-    GenTime m_maxDuration;
+
 
     int m_maxTrack;
 

diff --git a/src/transition.cpp b/src/transition.cpp
index a925fb795e5f823aea250de11c7ac0ba788be329..4e0ecc0f7b24edc83f5f002ebe0d206bfb38c5c9 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -275,6 +275,8 @@ int Transition::type() const {
     return 70001;
 }
 OPERATIONTYPE Transition::operationMode(QPointF pos, double scale) {
+    if (abs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
+    else if (abs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
     return MOVE;
 }
 void Transition::resizeTransitionStart(GenTime time) {