Improve manipulation of small items in timeline (Don't allow resize on very small...

[kdenlive] / src / clipitem.cpp

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index fadf7ba5843896aa2ac865f5b386bd3d9d7ed3fe..e164959cd589498d7b52a352b42e8580b2e2d039 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,19 +1359,25 @@ 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);
 }
 
-bool ClipItem::updateEffect(QDomElement effect)
+void ClipItem::updateEffect(QDomElement effect)
 {
     //kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag");
     m_effectList.updateEffect(effect);
@@ -1384,7 +1390,11 @@ bool ClipItem::updateEffect(QDomElement effect)
         r.setHeight(20);
         update(r);
     }
-    return true;
+}
+
+void ClipItem::enableEffects(QList <int> indexes, bool disable)
+{
+    m_effectList.enableEffects(indexes, disable);
 }
 
 bool ClipItem::moveEffect(QDomElement effect, int ix)
@@ -1415,6 +1425,7 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/)
     int ix;
     QDomElement insertedEffect;
     if (!effect.hasAttribute("kdenlive_ix")) {
+       // effect dropped from effect list
         ix = effectsCounter();
     } else ix = effect.attribute("kdenlive_ix").toInt();
     if (!m_effectList.isEmpty() && ix <= m_effectList.count()) {
@@ -1570,10 +1581,10 @@ void ClipItem::deleteEffect(QString index)
     m_effectList.removeAt(ix);
     m_effectNames = m_effectList.effectNames().join(" / ");
 
-    if (m_effectList.isEmpty() || m_selectedEffect + 1 == ix) {
+    if (m_effectList.isEmpty() || m_selectedEffect == ix) {
         // Current effect was removed
-        if (ix > m_effectList.count() - 1) {
-            setSelectedEffect(m_effectList.count() - 1);
+        if (ix > m_effectList.count()) {
+            setSelectedEffect(m_effectList.count());
         } else setSelectedEffect(ix);
     }
     if (needRepaint) update(boundingRect());
@@ -1629,6 +1640,20 @@ const ItemInfo ClipItem::speedIndependantInfo() const
     return m_speedIndependantInfo;
 }
 
+int ClipItem::nextFreeEffectGroupIndex() const
+{
+    int freeGroupIndex = 0;
+    for (int i = 0; i < m_effectList.count(); i++) {
+        QDomElement effect = m_effectList.at(i);
+       EffectInfo effectInfo;
+       effectInfo.fromString(effect.attribute("kdenlive_info"));
+       if (effectInfo.groupIndex >= freeGroupIndex) {
+           freeGroupIndex = effectInfo.groupIndex + 1;
+       }
+    }
+    return freeGroupIndex;
+}
+
 //virtual
 void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event)
 {
@@ -1638,11 +1663,17 @@ void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event)
        QDomDocument doc;
        doc.setContent(effects, true);
        QDomElement e = doc.documentElement();
-       if (e.tagName() == "list") {
+       if (e.tagName() == "effectgroup") {
            // dropped an effect group
            QDomNodeList effectlist = e.elementsByTagName("effect");
+           int freeGroupIndex = nextFreeEffectGroupIndex();
+           EffectInfo effectInfo;
            for (int i = 0; i < effectlist.count(); i++) {
-               effectlist.at(i).toElement().removeAttribute("kdenlive_ix");
+               QDomElement effect = effectlist.at(i).toElement();
+               effectInfo.fromString(effect.attribute("kdenlive_info"));
+               effectInfo.groupIndex = freeGroupIndex;
+               effect.setAttribute("kdenlive_info", effectInfo.toString());
+               effect.removeAttribute("kdenlive_ix");
            }
        } else {
            // single effect dropped