diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-25 22:24:47 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-25 22:24:47 -0400 |
| commit | 3031a99364333b9adcc52c4922687477a1e62337 (patch) | |
| tree | 226d75d493f0a7444aaea534a5d8e18020ccf095 /gtk2_ardour/time_axis_view.cc | |
| parent | 2b74c955f1e10896cc28c3937b884ad4723c0476 (diff) | |
| parent | 4a7c615714691984009a9fc05ebaeaceb335b641 (diff) | |
Merge branch 'master' into cairocanvas
Diffstat (limited to 'gtk2_ardour/time_axis_view.cc')
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 7957a591f8..8aa3e53639 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -281,7 +281,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) { switch (ev->direction) { case GDK_SCROLL_UP: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { + if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) { /* See Editor::_stepping_axis_view for notes on this hack */ Editor& e = dynamic_cast<Editor&> (_editor); if (!e.stepping_axis_view ()) { @@ -296,7 +296,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) break; case GDK_SCROLL_DOWN: - if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { + if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) { /* See Editor::_stepping_axis_view for notes on this hack */ Editor& e = dynamic_cast<Editor&> (_editor); if (!e.stepping_axis_view ()) { |