diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-03-12 21:16:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-03-12 21:16:28 +0000 |
| commit | f22d960879b3fd81e683232a0ace94b7147a715c (patch) | |
| tree | b7a466109387e8d79bc7b48c74f9808902bee97b | |
| parent | ef3aa2e1512ede05a24f1e7c4e9b5c70098b7200 (diff) | |
carl's inverted fix for mousewheel actions
git-svn-id: svn://localhost/ardour2/trunk@1578 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 18d2cea68e..2d91ee4776 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -52,7 +52,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) double wx, wy; switch (ev->direction) { - case GDK_SCROLL_UP: + case GDK_SCROLL_DOWN: if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) { //if (ev->state == GDK_CONTROL_MASK) { /* XXX @@ -88,7 +88,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) return true; } break; - case GDK_SCROLL_DOWN: + case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) { //if (ev->state == GDK_CONTROL_MASK) { track_canvas.get_pointer (x, y); diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 0a5d65b13d..2a0087dc2c 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -246,14 +246,14 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) switch (ev->direction) { case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) { - step_height (false); + step_height (true); return true; } break; case GDK_SCROLL_DOWN: if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) { - step_height (true); + step_height (false); return true; } break; |