diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-05-31 18:04:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-05-31 18:04:47 +0000 |
| commit | 6a4628e50acaaf1540491cf4aac412e8bb3fc0b3 (patch) | |
| tree | 3e1ea20945fb907221d4b9083177c100a47b11b9 /libs/gtkmm2ext/pixfader.cc | |
| parent | 556732df8047c5738d0f50fb192c45c02bb90def (diff) | |
Use the same logic to decide on step size when scroll-wheeling faders in the mixer and knobs in the monitor section (part of #4726).
git-svn-id: svn://localhost/ardour2/branches/3.0@12510 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/pixfader.cc')
| -rw-r--r-- | libs/gtkmm2ext/pixfader.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc index 9851b6397d..e146f7aa60 100644 --- a/libs/gtkmm2ext/pixfader.cc +++ b/libs/gtkmm2ext/pixfader.cc @@ -28,9 +28,6 @@ using namespace Gtkmm2ext; using namespace Gtk; using namespace std; -int PixFader::fine_scale_modifier = Keyboard::PrimaryModifier; -int PixFader::extra_fine_scale_modifier = Keyboard::SecondaryModifier; - PixFader::PixFader (Glib::RefPtr<Gdk::Pixbuf> belt, Gtk::Adjustment& adj, int orientation, int fader_length) : adjustment (adj), @@ -221,7 +218,7 @@ PixFader::on_button_release_event (GdkEventButton* ev) if (ev->state & Keyboard::TertiaryModifier) { adjustment.set_value (default_value); - } else if (ev->state & fine_scale_modifier) { + } else if (ev->state & Keyboard::GainFineScaleModifier) { adjustment.set_value (adjustment.get_lower()); } else if ((_orien == VERT && ev_pos < span - display_span()) || (_orien == HORIZ && ev_pos > span - display_span())) { /* above the current display height, remember X Window coords */ @@ -255,8 +252,8 @@ PixFader::on_scroll_event (GdkEventScroll* ev) double scale; bool ret = false; - if (ev->state & fine_scale_modifier) { - if (ev->state & extra_fine_scale_modifier) { + if (ev->state & Keyboard::GainFineScaleModifier) { + if (ev->state & Keyboard::GainExtraFineScaleModifier) { scale = 0.01; } else { scale = 0.05; @@ -320,8 +317,8 @@ PixFader::on_motion_notify_event (GdkEventMotion* ev) return true; } - if (ev->state & fine_scale_modifier) { - if (ev->state & extra_fine_scale_modifier) { + if (ev->state & Keyboard::GainFineScaleModifier) { + if (ev->state & Keyboard::GainExtraFineScaleModifier) { scale = 0.05; } else { scale = 0.1; |