diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-11-07 02:35:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-11-07 02:35:00 +0000 |
| commit | 94e069b14a904093fc846de1b4d4c3bd62440d64 (patch) | |
| tree | 896c4e79b6dce609e6334463829eb701c9db0f5d | |
| parent | 15b5aae173e85ec18b608ee800a475727d0a4b9d (diff) | |
Fix zoom cursor SNAFU (#274). Increase move threshold for zoom drags so that clicks are more likely to work.
git-svn-id: svn://localhost/ardour2/branches/3.0@7978 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/editor_drag.h | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index a0281fc427..67bd43e2b5 100644 --- 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 8e68ad4ec1..f2d49fa1d7 100644 --- 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: |