[Kdenlive-svn] [kdenlive/refactoring] src/plugins/timelineviewtools/selecttool: Fix moving a clip close to another one.

[Till T. <ro...@tt...>]

Git commit 0c76bc4ad63360d9aa426cbf037535ec5056dd6f by Till Theato.
Committed on 27/06/2012 at 10:52.
Pushed by theato into branch 'refactoring'.

Fix moving a clip close to another one.

M  +14   -3    src/plugins/timelineviewtools/selecttool/selectclipitemtool.cpp

http://commits.kde.org/kdenlive/0c76bc4ad63360d9aa426cbf037535ec5056dd6f

diff --git a/src/plugins/timelineviewtools/selecttool/selectclipitemtool.cpp b/src/plugins/timelineviewtools/selecttool/selectclipitemtool.cpp
index 8637cb3..5eb8358 100644
--- a/src/plugins/timelineviewtools/selecttool/selectclipitemtool.cpp
+++ b/src/plugins/timelineviewtools/selecttool/selectclipitemtool.cpp
@@ -43,7 +43,8 @@ void SelectClipItemTool::mouseMove(QGraphicsSceneMouseEvent* event)
             m_clip->setGeometry(m_clip->clip()->position(), position - m_clip->clip()->position());
             break;
         case SetPosition:
-            position = m_clip->rect().x();
+            m_boundLeft = 0;
+            m_boundRight = -1;
             m_clip->setGeometry(qMax(0, qRound(event->scenePos().x()) - m_original + m_clip->clip()->position()), m_clip->rect().width());
 
             QList<QGraphicsItem *> collisions = m_clip->collidingItems();
@@ -51,10 +52,20 @@ void SelectClipItemTool::mouseMove(QGraphicsSceneMouseEvent* event)
                 if (item->type() == TimelineClipItem::Type
                     && item->parentItem() == m_clip->parentItem()
                     && item != m_clip) {
-                    m_clip->setGeometry(position, m_clip->rect().width());
-                    break;
+                    TimelineClipItem *clip = static_cast<TimelineClipItem *>(item);
+                    if (clip->rect().x() < m_clip->rect().x()) {
+                        m_boundLeft = clip->clip()->position() + clip->clip()->duration();
+                    } else {
+                        m_boundRight = clip->clip()->position() - m_clip->clip()->duration();
+                    }
                 }
             }
+
+            position = qMax(m_boundLeft, qRound(m_clip->rect().x()));
+            if (m_boundRight >= m_boundLeft) {
+                position = qMin(m_boundRight, position);
+            }
+            m_clip->setGeometry(position, m_clip->rect().width());
             break;
     }
 }