"treadmill" design for new faders, for real

git-svn-id: svn://localhost/ardour2/trunk@1151 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/gtkmm2ext/gtkmm2ext/pixfader.h b/libs/gtkmm2ext/gtkmm2ext/pixfader.h
index 4d0edc46b7c0a6b1e2ebf104592c6043a8247082..bb4176240a678193acb8189df7aa6866ebb791d9 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/pixfader.h
+++ b/libs/gtkmm2ext/gtkmm2ext/pixfader.h
@@ -31,9 +31,7 @@ namespace Gtkmm2ext {
 
 class PixFader : public Gtk::DrawingArea {
   public:
-       PixFader (Glib::RefPtr<Gdk::Pixbuf> base, 
-                 Glib::RefPtr<Gdk::Pixbuf> handle,
-                 Gtk::Adjustment& adjustment);
+       PixFader (Glib::RefPtr<Gdk::Pixbuf> belt_image, Gtk::Adjustment& adjustment);
        virtual ~PixFader ();
        
   protected:
@@ -48,11 +46,10 @@ class PixFader : public Gtk::DrawingArea {
        bool on_scroll_event (GdkEventScroll* ev);
 
   private:  
-       Glib::RefPtr<Gdk::Pixbuf> base_pixbuf;
-       Glib::RefPtr<Gdk::Pixbuf> handle_pixbuf;
+       Glib::RefPtr<Gdk::Pixbuf> pixbuf;
        gint pixheight;
 
-       GdkRectangle pixrect;
+       GdkRectangle view;
 
        GdkWindow* grab_window;
        double grab_y;
@@ -64,9 +61,7 @@ class PixFader : public Gtk::DrawingArea {
 
        void adjustment_changed ();
 
-       int display_height () {
-               return (int) floor (pixheight * (1.0 - (adjustment.get_upper() - adjustment.get_value ()) / ((adjustment.get_upper() - adjustment.get_lower()))));
-       }
+       int display_height ();
 };
 
 

diff --git a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
index 83cc1fddfd489e801fe38750ddc38b771cdcb719..c137dbabf5ecb3d755324a05e6d81c023602b171 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
+++ b/libs/gtkmm2ext/gtkmm2ext/slider_controller.h
@@ -38,8 +38,7 @@ namespace Gtkmm2ext {
 class SliderController : public Gtkmm2ext::PixFader
 {
   public:
-       SliderController (Glib::RefPtr<Gdk::Pixbuf> slider,
-                         Glib::RefPtr<Gdk::Pixbuf> rail,
+       SliderController (Glib::RefPtr<Gdk::Pixbuf> image,
                          Gtk::Adjustment* adj,
                          PBD::Controllable&,
                          bool with_numeric = true);
@@ -64,8 +63,7 @@ class SliderController : public Gtkmm2ext::PixFader
 class VSliderController : public SliderController
 {
   public:
-       VSliderController (Glib::RefPtr<Gdk::Pixbuf> slider,
-                          Glib::RefPtr<Gdk::Pixbuf> rail,
+       VSliderController (Glib::RefPtr<Gdk::Pixbuf> image,
                           Gtk::Adjustment *adj,
                           PBD::Controllable&,
                           bool with_numeric = true);
@@ -74,8 +72,7 @@ class VSliderController : public SliderController
 class HSliderController : public SliderController
 {
   public:
-       HSliderController (Glib::RefPtr<Gdk::Pixbuf> slider,
-                          Glib::RefPtr<Gdk::Pixbuf> rail,
+       HSliderController (Glib::RefPtr<Gdk::Pixbuf> image,
                           Gtk::Adjustment *adj,
                           PBD::Controllable&,
                           bool with_numeric = true);

diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc
index 429f5bf3c5e1cafea1fffc643b75ae10cb7e6692..42f05677051ccbc69726063a6cf8f482b1d67504 100644 (file)
--- a/libs/gtkmm2ext/pixfader.cc
+++ b/libs/gtkmm2ext/pixfader.cc
@@ -27,21 +27,21 @@ using namespace Gtk;
 using namespace Gdk;
 using namespace std;
 
-PixFader::PixFader (Glib::RefPtr<Pixbuf> base, Glib::RefPtr<Pixbuf> handle, Gtk::Adjustment& adj)
+PixFader::PixFader (Glib::RefPtr<Pixbuf> belt, Gtk::Adjustment& adj)
        : adjustment (adj),
-         base_pixbuf (base),
-         handle_pixbuf (handle)
+         pixbuf (belt)
 {
        dragging = false;
        default_value = adjustment.get_value();
        last_drawn = -1;
-       pixrect.x = 0;
-       pixrect.y = 0;
-       pixrect.width  = base_pixbuf->get_width();
-       pixrect.height  = base_pixbuf->get_height();
-       pixheight = pixrect.height;
+       pixheight = pixbuf->get_height();
 
-       unity_y = (int) rint (pixrect.height - (default_value * pixrect.height));
+       view.x = 0;
+       view.y = 0;
+       view.width  = pixbuf->get_width();
+       view.height  = pixheight / 2;
+
+       unity_y = (int) rint (view.height - (default_value * view.height));
 
        add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK);
 
@@ -57,51 +57,30 @@ bool
 PixFader::on_expose_event (GdkEventExpose* ev)
 {
        GdkRectangle intersection;
-       GdkRectangle background;
-
-       pixrect.height = display_height ();
-
-       background.x = 0;
-       background.y = 0;
-       background.width = pixrect.width;
-       background.height = pixheight - pixrect.height;
-
-       if (gdk_rectangle_intersect (&background, &ev->area, &intersection)) {
-               get_window()->draw_pixbuf (get_style()->get_fg_gc (get_state()), base_pixbuf,
-                                          intersection.x, intersection.y,
-                                          0, 0,
-                                          intersection.width, intersection.height,
-                                          Gdk::RGB_DITHER_NONE, 0, 0);
-                                         
-       } 
-
-       /* recompute the height of the handle area to use X Window's top->bottom coordinate
-          system.
-       */
+       int dh = display_height ();
+       int offset_into_pixbuf = (int) floor (view.height / ((float) view.height / dh));
 
-       pixrect.y = pixheight - pixrect.height;
-       
-       if (gdk_rectangle_intersect (&pixrect, &ev->area, &intersection)) {
-               get_window()->draw_pixbuf(get_style()->get_fg_gc(get_state()), handle_pixbuf, 
-                                         intersection.x, intersection.y,
-                                         0, pixrect.y, 
+       if (gdk_rectangle_intersect (&view, &ev->area, &intersection)) {
+               get_window()->draw_pixbuf(get_style()->get_fg_gc(get_state()), pixbuf, 
+                                         intersection.x, offset_into_pixbuf + intersection.y,
+                                         0, 0,
                                          intersection.width, intersection.height,
                                          Gdk::RGB_DITHER_NONE, 0, 0);
        }
 
        /* always draw the line */
 
-       get_window()->draw_line (get_style()->get_fg_gc(get_state()), 0, unity_y, pixrect.width, unity_y);
+       get_window()->draw_line (get_style()->get_fg_gc(get_state()), 0, unity_y, view.width - 2, unity_y);
 
-       last_drawn = pixrect.height;
+       last_drawn = dh;
        return true;
 }
 
 void
 PixFader::on_size_request (GtkRequisition* req)
 {
-       req->width = base_pixbuf->get_width();
-       req->height = base_pixbuf->get_height ();
+       req->width = view.width;
+       req->height = view.height;
 }
 
 bool
@@ -109,6 +88,7 @@ PixFader::on_button_press_event (GdkEventButton* ev)
 {
        switch (ev->button) {
        case 1:
+       case 2:
                if (!(ev->state & Gdk::SHIFT_MASK)) {
                        add_modal_grab();
                        grab_y = ev->y;
@@ -129,6 +109,7 @@ bool
 PixFader::on_button_release_event (GdkEventButton* ev)
 {
        double scale;
+       double fract;
        
        if (ev->state & GDK_CONTROL_MASK) {
                if (ev->state & GDK_MOD1_MASK) {
@@ -148,29 +129,41 @@ PixFader::on_button_release_event (GdkEventButton* ev)
 
                        if (ev->y == grab_start) {
                                /* no motion - just a click */
-                               double fract;
-                               
-                               if (ev->y < (pixheight/2)) {
-                                       /* near the top */
-                                       fract = 1.0;
+
+                               if (ev->y < view.height - display_height()) {
+                                       /* above the current display height, remember X Window coords */
+                                       adjustment.set_value (adjustment.get_value() + adjustment.get_step_increment());
                                } else {
-                                       fract = 1.0 - (ev->y - pixheight);
+                                       adjustment.set_value (adjustment.get_value() - adjustment.get_step_increment());
                                }
-
-                               fract = min (1.0, fract);
-                               fract = max (0.0, fract);
-
-                               adjustment.set_value (scale * fract * (adjustment.get_upper() - adjustment.get_lower()));
                        }
+
                } else {
+                       
                        if (ev->state & Gdk::SHIFT_MASK) {
                                adjustment.set_value (default_value);
                        }
                }
                break;
+               
+       case 2:
+               if (dragging) {
+                       remove_modal_grab();
+                       dragging = false;
+                       
+                       fract = 1.0 - (ev->y / view.height); // inverted X Window coordinates, grrr
+                       
+                       fract = min (1.0, fract);
+                       fract = max (0.0, fract);
+                       
+                       adjustment.set_value (scale * fract * (adjustment.get_upper() - adjustment.get_lower()));
+               }
+               break;
+
        default:
                break;
        }
+
        return false;
 }
 
@@ -232,7 +225,7 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev)
                delta = ev->y - grab_y;
                grab_y = ev->y;
 
-               fract = (delta / pixheight);
+               fract = (delta / view.height);
 
                fract = min (1.0, fract);
                fract = max (-1.0, fract);
@@ -254,3 +247,10 @@ PixFader::adjustment_changed ()
                queue_draw ();
        }
 }
+
+int
+PixFader::display_height ()
+{
+       float fract = (adjustment.get_upper() - adjustment.get_value ()) / ((adjustment.get_upper() - adjustment.get_lower()));
+       return (int) floor (view.height * (1.0 - fract));
+}

diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc
index 96a873941cadd11a2e76aa4715af6b8600ce9c0b..3e2b42f409361011e3e275729b323dc335cf4e25 100644 (file)
--- a/libs/gtkmm2ext/slider_controller.cc
+++ b/libs/gtkmm2ext/slider_controller.cc
@@ -28,13 +28,12 @@
 using namespace Gtkmm2ext;
 using namespace PBD;
 
-SliderController::SliderController (Glib::RefPtr<Gdk::Pixbuf> slide,
-                                   Glib::RefPtr<Gdk::Pixbuf> rail,
+SliderController::SliderController (Glib::RefPtr<Gdk::Pixbuf> image,
                                    Gtk::Adjustment *adj,
                                    Controllable& c,
                                    bool with_numeric)
 
-       : PixFader (slide, rail, *adj),
+       : PixFader (image, *adj),
          binding_proxy (c),
          spin (*adj, 0, 2)
 {                        
@@ -59,13 +58,12 @@ SliderController::on_button_press_event (GdkEventButton *ev)
        return PixFader::on_button_press_event (ev);
 }
 
-VSliderController::VSliderController (Glib::RefPtr<Gdk::Pixbuf> slide,
-                                     Glib::RefPtr<Gdk::Pixbuf> rail,
+VSliderController::VSliderController (Glib::RefPtr<Gdk::Pixbuf> image,
                                      Gtk::Adjustment *adj,
                                      Controllable& control,
                                      bool with_numeric)
 
-       : SliderController (slide, rail, adj, control, with_numeric)
+       : SliderController (image, adj, control, with_numeric)
 {
        if (with_numeric) {
                spin_frame.add (spin);
@@ -76,13 +74,12 @@ VSliderController::VSliderController (Glib::RefPtr<Gdk::Pixbuf> slide,
        }
 }
 
-HSliderController::HSliderController (Glib::RefPtr<Gdk::Pixbuf> slide,
-                                     Glib::RefPtr<Gdk::Pixbuf> rail,
+HSliderController::HSliderController (Glib::RefPtr<Gdk::Pixbuf> image,
                                      Gtk::Adjustment *adj,
                                      Controllable& control,
                                      bool with_numeric)
        
-       : SliderController (slide, rail, adj, control, with_numeric)
+       : SliderController (image, adj, control, with_numeric)
 {
        if (with_numeric) {
                spin_frame.add (spin);