diff options
| author | David Robillard <d@drobilla.net> | 2008-02-02 17:22:04 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-02 17:22:04 +0000 |
| commit | 80c3677c837cc9eb432df3d65a34aba543fa7258 (patch) | |
| tree | ca23bb7e5bff6c35c151d73221002a9ce3abfe1a /gtk2_ardour/editor_canvas_events.cc | |
| parent | 9f63ab9931e6478472853bdda58da47ea29ac125 (diff) | |
Merge with 2.0-ongoing R2988
git-svn-id: svn://localhost/ardour2/branches/3.0@2991 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index a69dcf935a..3de7dc5c21 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -19,6 +19,7 @@ #include <cstdlib> #include <cmath> +#include <algorithm> #include <pbd/stacktrace.h> @@ -43,6 +44,7 @@ #include "i18n.h" using namespace sigc; +using namespace std; using namespace ARDOUR; using namespace PBD; using namespace Gtk; @@ -245,8 +247,8 @@ bool Editor::track_canvas_motion (GdkEvent *ev) { if (verbose_cursor_visible) { - verbose_canvas_cursor->property_x() = ev->motion.x + 20; - verbose_canvas_cursor->property_y() = ev->motion.y + 20; + verbose_canvas_cursor->property_x() = clamp_verbose_cursor_x (ev->motion.x + 20); + verbose_canvas_cursor->property_y() = clamp_verbose_cursor_y (ev->motion.y + 20); } #ifdef GTKOSX |