carl's inverted fix for mousewheel actions

git-svn-id: svn://localhost/ardour2/trunk@1578 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 18d2cea68eb47260f5bf1363acc5fcbebcd7b475..2d91ee47765393638afa9bbc7173a44b1d9a1735 100644 (file)
--- 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 0a5d65b13dff56387b83c8aeb80af8f9d3af7514..2a0087dc2ccd2798804ce4f2cb361db67a4d5b30 100644 (file)
--- 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;