[vlmc-devel] Timeline: Fix clip placement in collision detection

Yikai Lu git at videolan.org
Fri Aug 11 21:26:21 CEST 2017


vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Sat Aug 12 04:25:22 2017 +0900| [34dab072f6ff5d13755b81aa79e71706b4b4d358] | committer: Yikai Lu

Timeline: Fix clip placement in collision detection

> https://code.videolan.org/videolan/vlmc/commit/34dab072f6ff5d13755b81aa79e71706b4b4d358
---

 src/Gui/timeline/main.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gui/timeline/main.qml b/src/Gui/timeline/main.qml
index 2d127fdb..d8e717d1 100644
--- a/src/Gui/timeline/main.qml
+++ b/src/Gui/timeline/main.qml
@@ -106,7 +106,7 @@ Rectangle {
                     cEndPos += clipMargin;
                     if ( cEndPos >= newPos && newPos + target.length - 1 >= cPos ) {
                         if ( cPos >= newPos ) {
-                            if ( cPos - target.length + 1 > 0 )
+                            if ( cPos - target.length + clipMargin >= 0 )
                                 newPos = cPos - target.length + clipMargin;
                             else
                                 newPos = target.position;



More information about the Vlmc-devel mailing list