[Traverso-commit] traverso/src commands/Fade.cpp commands/Zoom.cp...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/04/20 06:12:39

Modified files:
        src/commands   : Fade.cpp Zoom.cpp 
        src/core       : ViewPort.cpp 

Log message:
        add <QApplication> to ViewPort.cpp, fix more commands to use 
on_first_input_event_x/y()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Fade.cpp?cvsroot=traverso&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Zoom.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ViewPort.cpp?cvsroot=traverso&r1=1.17&r2=1.18

Patches:
Index: commands/Fade.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Fade.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- commands/Fade.cpp   12 Apr 2007 15:30:59 -0000      1.11
+++ commands/Fade.cpp   20 Apr 2007 06:12:39 -0000      1.12
@@ -58,7 +58,7 @@
 
 int FadeRange::begin_hold()
 {
-       origX = cpointer().x();
+       origX = cpointer().on_first_input_event_x();
        newFade = origFade = m_curve->get_range();
        return 1;
 }

Index: commands/Zoom.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Zoom.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- commands/Zoom.cpp   17 Apr 2007 11:51:20 -0000      1.12
+++ commands/Zoom.cpp   20 Apr 2007 06:12:39 -0000      1.13
@@ -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: Zoom.cpp,v 1.12 2007/04/17 11:51:20 r_sijrier Exp $
+    $Id: Zoom.cpp,v 1.13 2007/04/20 06:12:39 benjie Exp $
 */
 
 #include <libtraversocore.h>
@@ -50,8 +50,8 @@
 int Zoom::begin_hold()
 {
         jogZoomTotalX = cpointer().get_viewport()->viewport()->width();
-        verticalJogZoomLastY = cpointer().y();
-        baseJogZoomXFactor = m_sv->get_song()->get_hzoom() - ((int) ( (float) 
(jogZoomTotalX - cpointer().x()) / jogZoomTotalX * 50 ) + 1 );
+        verticalJogZoomLastY = cpointer().on_first_input_event_y();
+        baseJogZoomXFactor = m_sv->get_song()->get_hzoom() - ((int) ( (float) 
(jogZoomTotalX - cpointer().on_first_input_event_x()) / jogZoomTotalX * 50 ) + 
1 );
        
        return 1;
 }

Index: core/ViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ViewPort.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- core/ViewPort.cpp   16 Apr 2007 09:08:31 -0000      1.17
+++ core/ViewPort.cpp   20 Apr 2007 06:12:39 -0000      1.18
@@ -29,6 +29,7 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QEvent>
 #include <QStyleOptionGraphicsItem>
+#include <QApplication>
 #include <Utils.h>
 #include "InputEngine.h"