Fix zoom cursor SNAFU (#274). Increase move threshold for zoom drags so that clicks...

git-svn-id: svn://localhost/ardour2/branches/3.0@7978 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index a0281fc4276574dd15e71291bbf71f3ff91340f5..67bd43e2b515e8575cfac1eb8e2f44702d54b53b 100644 (file)
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -808,6 +808,10 @@ public:
        void finished (GdkEvent *, bool);
        void aborted ();
 
+       std::pair<ARDOUR::framecnt_t, int> move_threshold () const {
+               return std::make_pair (4, 4);
+       }
+
 private:
        bool _zoom_out;
 };

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 8e68ad4ec18d6ffddfc2a01c9f5077b116c1550b..f2d49fa1d711ce812f303b97bb75a697b2174777 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -270,7 +270,11 @@ Editor::set_canvas_cursor ()
                        break;
 
                case MouseZoom:
-                       current_canvas_cursor = zoom_in_cursor;
+                       if (Keyboard::the_keyboard().key_is_down (GDK_Control_L)) {
+                               current_canvas_cursor = zoom_out_cursor;
+                       } else {
+                               current_canvas_cursor = zoom_in_cursor;
+                       }
                        break;
 
                case MouseTimeFX: