Fix fader jumps when releasing button 2 on drags; move to mouse position on button...

git-svn-id: svn://localhost/ardour2/branches/3.0@8615 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/gtkmm2ext/gtkmm2ext/pixfader.h b/libs/gtkmm2ext/gtkmm2ext/pixfader.h
index a8d54abb59e67267d711f86c30bbfc46b924cf6c..36989a25a6924d20177f592cab7e5baa4714ee50 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/pixfader.h
+++ b/libs/gtkmm2ext/gtkmm2ext/pixfader.h
@@ -70,8 +70,8 @@ class PixFader : public Gtk::DrawingArea
        int unity_loc;
 
        void adjustment_changed ();
-
        int display_span ();
+       void set_adjustment_from_event (GdkEventButton *);
 
        static int fine_scale_modifier;
        static int extra_fine_scale_modifier;

diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc
index 46f31cbe765ad95ae42e5f57accf6d96aa4c1e94..9a0d2f66d681aa6e562c5e8d46a5a1bcfc688352 100644 (file)
--- a/libs/gtkmm2ext/pixfader.cc
+++ b/libs/gtkmm2ext/pixfader.cc
@@ -125,30 +125,28 @@ PixFader::on_button_press_event (GdkEventButton* ev)
        if (ev->type != GDK_BUTTON_PRESS) {
                return false;
        }
-       
-       switch (ev->button) {
-       case 1:
-       case 2:
-               add_modal_grab();
-               grab_loc = (_orien == VERT) ? ev->y : ev->x;
-               grab_start = (_orien == VERT) ? ev->y : ev->x;
-               grab_window = ev->window;
-               dragging = true;
-               return true;
-       default:
-               break;
-       } 
-                              
 
-       return false;
+       if (ev->button != 1 && ev->button != 2) {
+               return false;
+       }
+
+       add_modal_grab ();
+       grab_loc = (_orien == VERT) ? ev->y : ev->x;
+       grab_start = (_orien == VERT) ? ev->y : ev->x;
+       grab_window = ev->window;
+       dragging = true;
+
+       if (ev->button == 2) {
+               set_adjustment_from_event (ev);
+       }
+       
+       return true;
 }
 
 bool
 PixFader::on_button_release_event (GdkEventButton* ev)
 {
-       double fract, ev_pos;
-
-       ev_pos = (_orien == VERT) ? ev->y : ev->x;
+       double const ev_pos = (_orien == VERT) ? ev->y : ev->x;
        
        switch (ev->button) {
        case 1:
@@ -179,13 +177,7 @@ PixFader::on_button_release_event (GdkEventButton* ev)
                if (dragging) {
                        remove_modal_grab();
                        dragging = false;
-                       
-                       fract = 1.0 - (ev_pos / span); // inverted X Window coordinates, grrr
-                       
-                       fract = min (1.0, fract);
-                       fract = max (0.0, fract);
-                       
-                       adjustment.set_value (fract * (adjustment.get_upper() - adjustment.get_lower()));
+                       set_adjustment_from_event (ev);
                }
                break;
 
@@ -338,3 +330,14 @@ PixFader::on_leave_notify_event (GdkEventCrossing*)
        Keyboard::magic_widget_drop_focus();
        return false;
 }
+
+void
+PixFader::set_adjustment_from_event (GdkEventButton* ev)
+{
+       double fract = (_orien == VERT) ? (1.0 - (ev->y / span)) : (ev->x / span);
+
+       fract = min (1.0, fract);
+       fract = max (0.0, fract);
+
+       adjustment.set_value (fract * (adjustment.get_upper () - adjustment.get_lower ()));
+}