diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-03-13 12:08:41 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-03-13 12:08:41 +0000 |
| commit | c1a5269c55be92f5b571ce3bb6a0040b54bb0257 (patch) | |
| tree | eedd3fe26eb43655b76f1abe4d1e08e13b043876 /gtk2_ardour/editor_canvas_events.cc | |
| parent | a493ea0aab249d0a17d99c449206a241f83bc999 (diff) | |
fix panner visual corruption bug #1213; more consistent naming for automation states; carl's wheel-3 patch
git-svn-id: svn://localhost/ardour2/trunk@1581 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 2d91ee4776..b7b0288ed8 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_DOWN: + case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) { //if (ev->state == GDK_CONTROL_MASK) { /* XXX @@ -71,7 +71,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) event.button.y = wy; nframes_t where = event_frame (&event, 0, 0); - temporal_zoom_to_frame (true, where); + temporal_zoom_to_frame (false, where); return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) { if (!current_stepping_trackview) { @@ -88,7 +88,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) return true; } break; - case GDK_SCROLL_UP: + case GDK_SCROLL_DOWN: if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) { //if (ev->state == GDK_CONTROL_MASK) { track_canvas.get_pointer (x, y); @@ -102,7 +102,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) event.button.y = wy; nframes_t where = event_frame (&event, 0, 0); - temporal_zoom_to_frame (false, where); + temporal_zoom_to_frame (true, where); return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) { if (!current_stepping_trackview) { |