traverso-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Traverso-commit] traverso/src/commands MoveClip.cpp MoveClip.h


From: Remon Sijrier
Subject: [Traverso-commit] traverso/src/commands MoveClip.cpp MoveClip.h
Date: Mon, 04 Jun 2007 15:51:04 +0000

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/06/04 15:51:04

Modified files:
        src/commands   : MoveClip.cpp MoveClip.h 

Log message:
        disable bypassjog again if mouse moves certain distance

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.h?cvsroot=traverso&r1=1.19&r2=1.20

Patches:
Index: MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- MoveClip.cpp        3 Jun 2007 22:23:30 -0000       1.44
+++ MoveClip.cpp        4 Jun 2007 15:51:03 -0000       1.45
@@ -283,10 +283,21 @@
 
 int MoveClip::jog()
 {
-       if (! m_clip || d->bypassjog) {
+       if (!m_clip) {
                return 0;
        }
        
+       if (d->bypassjog) {
+               QPoint diff = d->jogBypassPos - cpointer().pos();
+               if (diff.manhattanLength() > 35) {
+                       d->bypassjog = false;
+               } else {
+                       return 0;
+               }
+       }
+       
+       d->jogBypassPos = cpointer().pos();
+       
        int scrollbardif = d->hScrollbarValue - d->sv->hscrollbar_value();
        
        QPointF diffPoint(cpointer().pos() - d->origPos);

Index: MoveClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- MoveClip.h  5 May 2007 17:13:13 -0000       1.19
+++ MoveClip.h  4 Jun 2007 15:51:03 -0000       1.20
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: MoveClip.h,v 1.19 2007/05/05 17:13:13 benjie Exp $
+    $Id: MoveClip.h,v 1.20 2007/06/04 15:51:03 r_sijrier Exp $
 */
 
 #ifndef MOVECLIPACTION_H
@@ -76,6 +76,7 @@
                nframes_t       origTrackEndFrame;
                bool            resync;
                bool            bypassjog;
+               QPoint          jogBypassPos;
        };
                        
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]