diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-12-09 15:44:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-12-09 15:44:59 +0000 |
| commit | 2c07e83e4b9f98c88b781c51e712fcb5942c6554 (patch) | |
| tree | b4986875c9ce395acf6c17db978370baf732f76b /gtk2_ardour/editor_summary.cc | |
| parent | 99edcd7940376cb76301f3f098e0b5a3fd8fbd33 (diff) | |
Use same modifiers with the mouse wheel in the summary as in the editor (#4543).
git-svn-id: svn://localhost/ardour2/branches/3.0@10947 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_summary.cc')
| -rw-r--r-- | gtk2_ardour/editor_summary.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc index a4a6a9d73e..54b40ed610 100644 --- a/gtk2_ardour/editor_summary.cc +++ b/gtk2_ardour/editor_summary.cc @@ -586,9 +586,9 @@ EditorSummary::on_scroll_event (GdkEventScroll* ev) amount = 1; } - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { - /* primary-wheel == left-right scrolling */ + /* secondary-wheel == left-right scrolling */ if (ev->direction == GDK_SCROLL_UP) { x += amount; @@ -596,6 +596,16 @@ EditorSummary::on_scroll_event (GdkEventScroll* ev) x -= amount; } + } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + + /* primary-wheel == zoom */ + + if (ev->direction == GDK_SCROLL_UP) { + _editor->temporal_zoom_step (false); + } else { + _editor->temporal_zoom_step (true); + } + } else { if (ev->direction == GDK_SCROLL_DOWN) { |