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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/06/04 19:53:56

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

Log message:
        better edge-dragging protection now keeps a clip from getting smaller 
than 2 pixels wide

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveEdge.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveEdge.h?cvsroot=traverso&r1=1.7&r2=1.8

Patches:
Index: MoveEdge.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveEdge.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- MoveEdge.cpp        17 May 2007 06:55:42 -0000      1.18
+++ MoveEdge.cpp        4 Jun 2007 19:53:56 -0000       1.19
@@ -60,9 +60,11 @@
        PENTER;
         if (m_edge == "set_left_edge") {
                 m_newPos = m_originalPos = m_clip->get_track_start_frame();
+               m_otherEdgePos = m_clip->get_track_end_frame();
        }
         if (m_edge == "set_right_edge") {
                 m_newPos = m_originalPos = m_clip->get_track_end_frame();
+               m_otherEdgePos = m_clip->get_track_start_frame();
        }
 
        m_clip->set_snappable(false);
@@ -108,6 +110,14 @@
                m_newPos = slist->get_snap_value(m_newPos);
        }
 
+       if (m_edge == "set_right_edge" && m_newPos < m_otherEdgePos + (2 * 
m_sv->scalefactor)) {
+               m_newPos = m_otherEdgePos + (2 * m_sv->scalefactor);
+       }
+
+       if (m_edge == "set_left_edge" && m_newPos > m_otherEdgePos - (2 * 
m_sv->scalefactor)) {
+               m_newPos = m_otherEdgePos - (2 * m_sv->scalefactor);
+       }
+
         return do_action();
 }
 

Index: MoveEdge.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveEdge.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- MoveEdge.h  20 Apr 2007 06:37:10 -0000      1.7
+++ MoveEdge.h  4 Jun 2007 19:53:56 -0000       1.8
@@ -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: MoveEdge.h,v 1.7 2007/04/20 06:37:10 benjie Exp $
+    $Id: MoveEdge.h,v 1.8 2007/06/04 19:53:56 benjie Exp $
 */
 
 #ifndef MOVEEDGE_H
@@ -55,6 +55,7 @@
         QByteArray     m_edge;
         long           m_originalPos;
         long           m_newPos;
+        long           m_otherEdgePos;
 };
 
 #endif