diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-01 04:26:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-01 04:26:22 +0000 |
| commit | bd3b9d763b0409c8e59d5ea38857d604e917818a (patch) | |
| tree | d9d5dbb001901da5ab5522777055513a79522a77 /gtk2_ardour/editor_canvas_events.cc | |
| parent | 76c658ea48e1ad11b7f407d15e5e8c1e3e55ebb4 (diff) | |
large chunks of code to deal with pre-analysis of audio; transient/perconset data used for new tab-to-transient; all ArdourDialogs push the splash screen out of the way; try to keep verbose canvas cursor within the editor canvas visible area; fix template use from NSD
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2983 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 d0085b685b..2d4531f2d1 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 |