From 18efe8f446f45b541f19a2f99dd707f66fb72a3e Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 30 Nov 2014 15:04:03 +0100 Subject: [PATCH] consistent step+page sizes for fader+spinbox --- libs/gtkmm2ext/pixfader.cc | 4 ++-- libs/gtkmm2ext/slider_controller.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc index 51a397ffbe..bfdec04fcd 100644 --- a/libs/gtkmm2ext/pixfader.cc +++ b/libs/gtkmm2ext/pixfader.cc @@ -473,10 +473,10 @@ PixFader::on_scroll_event (GdkEventScroll* ev) if (ev->state & Keyboard::GainExtraFineScaleModifier) { scale = 0.005; } else { - scale = 0.05; + scale = 0.1; } } else { - scale = 0.25; + scale = 1.0; } if (_orien == VERT) { diff --git a/libs/gtkmm2ext/slider_controller.cc b/libs/gtkmm2ext/slider_controller.cc index 496162d21f..f0ad19d055 100644 --- a/libs/gtkmm2ext/slider_controller.cc +++ b/libs/gtkmm2ext/slider_controller.cc @@ -41,8 +41,8 @@ SliderController::SliderController (Gtk::Adjustment *adj, boost::shared_ptrlower ()); _spin_adj.set_upper (mc->upper ()); - _spin_adj.set_step_increment((mc->upper () - mc->lower ()) / 100); - _spin_adj.set_page_increment((mc->upper () - mc->lower ()) / 10); + _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));