summaryrefslogtreecommitdiff
path: root/libs/gtkmm2ext
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2014-11-30 15:04:03 +0100
committerRobin Gareus <robin@gareus.org>2014-11-30 15:05:40 +0100
commit18efe8f446f45b541f19a2f99dd707f66fb72a3e (patch)
tree07c2a4728610d2a728e33b5b5aabb4b57526da42 /libs/gtkmm2ext
parentfb3f9033cfdb22e8d8651d95617cb51258eff3d4 (diff)
consistent step+page sizes for fader+spinbox
Diffstat (limited to 'libs/gtkmm2ext')
-rw-r--r--libs/gtkmm2ext/pixfader.cc4
-rw-r--r--libs/gtkmm2ext/slider_controller.cc4
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_ptr<PBD:
if (mc) {
_spin_adj.set_lower (mc->lower ());
_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));