-SliderController::SliderController (Glib::RefPtr<Gdk::Pixbuf> slide,
- Glib::RefPtr<Gdk::Pixbuf> rail,
- Gtk::Adjustment *adj,
- Controllable& c,
- bool with_numeric)
-
- : PixScroller (*adj, slide, rail),
- binding_proxy (c),
- spin (*adj, 0, 2)
-{
- spin.set_name ("SliderControllerValue");
- spin.set_size_request (70,-1); // should be based on font size somehow
- spin.set_numeric (true);
- spin.set_snap_to_ticks (false);
+SliderController::SliderController (Gtk::Adjustment *adj, boost::shared_ptr<PBD::Controllable> mc, int orientation, int fader_length, int fader_girth)
+ : PixFader (*adj, orientation, fader_length, fader_girth)
+ , _ctrl (mc)
+ , _ctrl_adj (adj)
+ , _spin_adj (0, 0, 1.0, .1, .01)
+ , _spin (_spin_adj, 0, 2)
+ , _ctrl_ignore (false)
+ , _spin_ignore (false)
+{
+ if (mc) {
+ _spin_adj.set_lower (mc->lower ());
+ _spin_adj.set_upper (mc->upper ());
+ _spin_adj.set_step_increment(_ctrl->interface_to_internal(adj->get_step_increment()) - mc->lower ());
+ _spin_adj.set_page_increment(_ctrl->interface_to_internal(adj->get_page_increment()) - mc->lower ());
+
+ adj->signal_value_changed().connect (sigc::mem_fun(*this, &SliderController::ctrl_adjusted));
+ _spin_adj.signal_value_changed().connect (sigc::mem_fun(*this, &SliderController::spin_adjusted));
+
+ _binding_proxy.set_controllable (mc);
+ }
+
+ _spin.set_name ("SliderControllerValue");
+ _spin.set_numeric (true);
+ _spin.set_snap_to_ticks (false);
+}
+
+bool
+SliderController::on_button_press_event (GdkEventButton *ev)
+{
+ if (_binding_proxy.button_press_handler (ev)) {
+ return true;
+ }
+
+ return PixFader::on_button_press_event (ev);