Fix editing clip crop start and fade effects lost when resizing clip:

[kdenlive] / src / clipitem.cpp

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index d6be7a43ec0892520f2aeecfa9ad029058d6e0ac..f672cd8af538ad020f0651ec9e06068f51c838e7 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -433,7 +433,7 @@ void ClipItem::setSelectedEffect(const int ix)
 {
     m_selectedEffect = ix;
     QLocale locale;
-    QDomElement effect = effectAt(m_selectedEffect);
+    QDomElement effect = effectAtIndex(m_selectedEffect);
     if (!effect.isNull() && effect.attribute("disable") != "1") {
         QDomNodeList params = effect.elementsByTagName("parameter");
         for (int i = 0; i < params.count(); i++) {
@@ -487,7 +487,7 @@ QStringList ClipItem::keyframes(const int index)
 void ClipItem::updateKeyframeEffect()
 {
     // regenerate xml parameter from the clip keyframes
-    QDomElement effect = getEffectAt(m_selectedEffect);
+    QDomElement effect = getEffectAtIndex(m_selectedEffect);
     if (effect.attribute("disable") == "1") return;
     QDomNodeList params = effect.elementsByTagName("parameter");
     QDomElement e = params.item(m_visibleParam).toElement();
@@ -509,7 +509,7 @@ void ClipItem::updateKeyframeEffect()
 QDomElement ClipItem::selectedEffect()
 {
     if (m_selectedEffect == -1 || m_effectList.isEmpty()) return QDomElement();
-    return effectAt(m_selectedEffect);
+    return effectAtIndex(m_selectedEffect);
 }
 
 void ClipItem::resetThumbs(bool clearExistingThumbs)
@@ -1002,11 +1002,11 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos)
 
     if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset  && qAbs((int)(pos.y() - rect.y())) < 6) {
         return FADEIN;
-    } else if (pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) {
+    } else if ((pos.x() <= rect.x() + rect.width() / 2) && pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) {
         return RESIZESTART;
     } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) {
         return FADEOUT;
-    } else if ((rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) {
+    } else if ((pos.x() >= rect.x() + rect.width() / 2) && (rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) {
         return RESIZEEND;
     } else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) {
         return TRANSITIONSTART;
@@ -1359,13 +1359,19 @@ QStringList ClipItem::effectNames()
     return m_effectList.effectNames();
 }
 
-QDomElement ClipItem::effectAt(int ix) const
+QDomElement ClipItem::effect(int ix) const
+{
+    if (ix >= m_effectList.count() || ix < 0) return QDomElement();
+    return m_effectList.at(ix).cloneNode().toElement();
+}
+
+QDomElement ClipItem::effectAtIndex(int ix) const
 {
     if (ix > m_effectList.count() || ix <= 0) return QDomElement();
     return m_effectList.itemFromIndex(ix).cloneNode().toElement();
 }
 
-QDomElement ClipItem::getEffectAt(int ix) const
+QDomElement ClipItem::getEffectAtIndex(int ix) const
 {
     if (ix > m_effectList.count() || ix <= 0) return QDomElement();
     return m_effectList.itemFromIndex(ix);
@@ -1386,6 +1392,11 @@ void ClipItem::updateEffect(QDomElement effect)
     }
 }
 
+void ClipItem::enableEffects(QList <int> indexes, bool disable)
+{
+    m_effectList.enableEffects(indexes, disable);
+}
+
 bool ClipItem::moveEffect(QDomElement effect, int ix)
 {
     if (ix <= 0 || ix > (m_effectList.count()) || effect.isNull()) {
@@ -1845,9 +1856,9 @@ QMap<int, QDomElement> ClipItem::adjustEffectsToDuration(int width, int height,
             if (id == "fade_from_black" || id == "fadein") {
                 if (in != cropStart().frames(m_fps)) {
                     effects[i] = effect.cloneNode().toElement();
-                    int diff = in - cropStart().frames(m_fps);
-                    in -= diff;
-                    out -= diff;
+                    int duration = out - in;
+                    in = cropStart().frames(m_fps);
+                    out = in + duration;
                     EffectsList::setParameter(effect, "in", QString::number(in));
                     EffectsList::setParameter(effect, "out", QString::number(out));
                 }