[vlmc-devel] commit: TracksView: Deactivating collision between effects and clips. ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Thu Sep  9 10:32:07 2010 +0200| [12b8ef60cd6efa73ff0c1a308df7bcb52db958c5] | committer: Hugo Beauzée-Luyssen 

TracksView: Deactivating collision between effects and clips.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=12b8ef60cd6efa73ff0c1a308df7bcb52db958c5
---

 src/Gui/timeline/TracksView.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Gui/timeline/TracksView.cpp b/src/Gui/timeline/TracksView.cpp
index 5847161..5f77e0b 100644
--- a/src/Gui/timeline/TracksView.cpp
+++ b/src/Gui/timeline/TracksView.cpp
@@ -435,7 +435,8 @@ TracksView::moveItem( AbstractGraphicsItem *item, QPoint position )
     for ( int i = 0; i < list.size(); ++i )
     {
         track = qgraphicsitem_cast<GraphicsTrack*>( list.at(i) );
-        if (track) break;
+        if ( track )
+            break;
     }
 
     if ( !track )
@@ -552,7 +553,8 @@ TracksView::moveItem( AbstractGraphicsItem *item, qint32 track, qint64 time )
 ItemPosition
 TracksView::findPosition( AbstractGraphicsItem *item, qint32 track, qint64 time )
 {
-
+    if ( qgraphicsitem_cast<GraphicsEffectItem*>( item ) != NULL )
+        return ItemPosition( track, time );
     // Create a fake item for computing collisions
     QGraphicsRectItem *chkItem = new QGraphicsRectItem( item->boundingRect() );
     chkItem->setParentItem( getTrack( item->trackType(), track ) );