Fix resizing a item from start caused the item to move if it was in a group which...

svn path=/trunk/kdenlive/; revision=4600

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index e1bd3d9ba537373c78922cb72b8e79e2647ba695..25d2b87f17cc2580258ecf291ce2beb787d47e9c 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1041,6 +1041,11 @@ void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos)
             break;
         }
     }
+    rebuildGroup(group);
+}
+
+void CustomTrackView::rebuildGroup(AbstractGroupItem *group)
+{
     if (group) {
         QList <QGraphicsItem *> children = group->childItems();
         m_document->clipManager()->removeGroup(group);
@@ -3170,9 +3175,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                         info.track = m_document->tracksCount() - info.track;
                         Mlt::Producer *prod;
                         adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), moveGroup);
-                        if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track);
-                        else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
-                        else prod = clip->baseClip()->producer(info.track);
+                        if (clip->isAudioOnly())
+                            prod = clip->baseClip()->audioProducer(info.track);
+                        else if (clip->isVideoOnly())
+                            prod = clip->baseClip()->videoProducer();
+                        else
+                            prod = clip->baseClip()->producer(info.track);
                         m_document->renderer()->mltInsertClip(info, clip->xml(), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
                         for (int i = 0; i < clip->effectsCount(); i++) {
                             m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false);
@@ -3188,7 +3196,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                         m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
                     }
                 }
-
+                rebuildGroup((AbstractGroupItem *)group);
                 new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveGroup);
                 m_commandStack->push(moveGroup);
 
@@ -3915,22 +3923,28 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
             ItemInfo info = item->info();
             int tracknumber = m_document->tracksCount() - info.track - 1;
             bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
-            if (isLocked) item->setItemLocked(true);
-            else if (item->isItemLocked()) item->setItemLocked(false);
+            if (isLocked)
+                item->setItemLocked(true);
+            else if (item->isItemLocked())
+                item->setItemLocked(false);
 
             if (item->type() == AVWIDGET) {
                 ClipItem *clip = static_cast <ClipItem*>(item);
                 info.track = m_document->tracksCount() - info.track;
                 Mlt::Producer *prod;
-                if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track);
-                else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
-                else prod = clip->baseClip()->producer(info.track);
+                if (clip->isAudioOnly())
+                    prod = clip->baseClip()->audioProducer(info.track);
+                else if (clip->isVideoOnly())
+                    prod = clip->baseClip()->videoProducer();
+                else
+                    prod = clip->baseClip()->producer(info.track);
                 m_document->renderer()->mltInsertClip(info, clip->xml(), prod);
             } else if (item->type() == TRANSITIONWIDGET) {
                 Transition *tr = static_cast <Transition*>(item);
                 int newTrack;
-                if (!tr->forcedTrack()) newTrack = getPreviousVideoTrack(info.track);
-                else {
+                if (!tr->forcedTrack()) {
+                    newTrack = getPreviousVideoTrack(info.track);
+                } else {
                     newTrack = tr->transitionEndTrack() + trackOffset;
                     if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track);
                 }

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 3220a1132b6dc0d1b783a2a7da72e85ff1f4869c..fc6c2ff79ec3ff8fe207bb4e446774d820b083ed 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -219,10 +219,13 @@ public slots:
     void slotSelectTrack(int ix);
     void insertZoneOverwrite(QStringList data, int in);
 
-    /** @brief Rebuilds a group to fit changes to it's childen.
+    /** @brief Rebuilds a group to fit again after children changed.
     * @param childTrack the track of one of the groups children
     * @param childPos The position of the same child */
     void rebuildGroup(int childTrack, GenTime childPos);
+    /** @brief Rebuilds a group to fit again after children changed.
+    * @param group The group to rebuild */
+    void rebuildGroup(AbstractGroupItem *group);
 
 protected:
     virtual void drawBackground(QPainter * painter, const QRectF & rect);