X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Fslider_controller.cc;h=c55697a2ee43369d2914a24d4bf6661795d3893f;hb=9a0b1cce075f32768197d001f269a191869cc4e6;hp=93dfb27ae2568baa2a1847e512b4498ff05aa052;hpb=859e9106e72a7908fa093d946111d148223225a0;p=ardour.git diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc index 93dfb27ae2..c55697a2ee 100644 --- a/libs/gtkmm2ext/slider_controller.cc +++ b/libs/gtkmm2ext/slider_controller.cc @@ -28,13 +28,14 @@ using namespace Gtkmm2ext; using namespace PBD; -SliderController::SliderController (Glib::RefPtr image, - Gtk::Adjustment *adj, int orientation, - Controllable& c, - bool with_numeric) - - : PixFader (image, *adj, orientation), - binding_proxy (c), +SliderController::SliderController ( + Glib::RefPtr image, + Glib::RefPtr image_desensitised, + Gtk::Adjustment *adj, + int orientation, + int fader_length + ) + : PixFader (image, image_desensitised, *adj, orientation, fader_length), spin (*adj, 0, 2) { spin.set_name ("SliderControllerValue"); @@ -55,15 +56,15 @@ SliderController::on_button_press_event (GdkEventButton *ev) if (binding_proxy.button_press_handler (ev)) { return true; } + return PixFader::on_button_press_event (ev); } -VSliderController::VSliderController (Glib::RefPtr image, - Gtk::Adjustment *adj, - Controllable& control, +VSliderController::VSliderController (Glib::RefPtr image, Glib::RefPtr image_desensitised, + Gtk::Adjustment *adj, int fader_length, bool with_numeric) - : SliderController (image, adj, VERT, control, with_numeric) + : SliderController (image, image_desensitised, adj, VERT, fader_length) { if (with_numeric) { spin_frame.add (spin); @@ -74,12 +75,11 @@ VSliderController::VSliderController (Glib::RefPtr image, } } -HSliderController::HSliderController (Glib::RefPtr image, - Gtk::Adjustment *adj, - Controllable& control, +HSliderController::HSliderController (Glib::RefPtr image, Glib::RefPtr image_desensitised, + Gtk::Adjustment *adj, int fader_length, bool with_numeric) - : SliderController (image, adj, HORIZ, control, with_numeric) + : SliderController (image, image_desensitised, adj, HORIZ, fader_length) { if (with_numeric) { spin_frame.add (spin);