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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/04/30 04:07:38

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

Log message:
        add cancel_action() to FadeRange (hmmm...  why does [FG]-Esc still not 
work?)

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

Patches:
Index: Fade.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Fade.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- Fade.cpp    20 Apr 2007 06:12:39 -0000      1.12
+++ Fade.cpp    30 Apr 2007 04:07:38 -0000      1.13
@@ -84,6 +84,13 @@
 }
 
 
+void FadeRange::cancel_action()
+{
+       finish_hold();
+       undo_action();
+}
+
+
 int FadeRange::jog()
 {
        int dx = (origX - (cpointer().x()) ) * m_direction;
@@ -117,7 +124,7 @@
 int FadeBend::begin_hold()
 {
        PENTER;
-       origY = cpointer().y();
+       origY = cpointer().on_first_input_event_y();
        oldValue =  m_fade->get_bend_factor();
        m_fv->set_holding(true);
        return 1;
@@ -172,7 +179,7 @@
 int FadeStrength::begin_hold()
 {
        PENTER;
-       origY = cpointer().y();
+       origY = cpointer().on_first_input_event_y();
        oldValue =  m_fade->get_strenght_factor();
        m_fv->set_holding(true);
        return 1;

Index: Fade.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Fade.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Fade.h      23 Feb 2007 14:00:24 -0000      1.7
+++ Fade.h      30 Apr 2007 04:07:38 -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: Fade.h,v 1.7 2007/02/23 14:00:24 r_sijrier Exp $
+$Id: Fade.h,v 1.8 2007/04/30 04:07:38 benjie Exp $
 */
 
 #ifndef FADE_H
@@ -42,6 +42,7 @@
         int prepare_actions();
         int do_action();
         int undo_action();
+       void cancel_action();
 
         int jog();