use clipitem resize also for transition resize

[kdenlive] / src / abstractclipitem.cpp

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;
+}