summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas_events.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-04-10 21:34:22 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-04-10 21:34:22 +0000
commit8883da6da02d5ebbdb272b41b960408bb1bb8a33 (patch)
treed6445a016d68be3afcd0d694a694734da09fb321 /gtk2_ardour/editor_canvas_events.cc
parente72db2860432afe8984c4d7ca44cf2ad7df997aa (diff)
new swedish gtk2_ardour translation; fix button release adds extra control point; fix click in automation track selects regions
git-svn-id: svn://localhost/ardour2/trunk@1697 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_canvas_events.cc')
-rw-r--r--gtk2_ardour/editor_canvas_events.cc55
1 files changed, 27 insertions, 28 deletions
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 4b46ba7290..bdae41f7ba 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -20,6 +20,8 @@
#include <cstdlib>
#include <cmath>
+#include <pbd/stacktrace.h>
+
#include <ardour/audio_diskstream.h>
#include <ardour/audioplaylist.h>
@@ -129,39 +131,35 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
}
bool
-Editor::track_canvas_event (GdkEvent *event, ArdourCanvas::Item* item)
+Editor::track_canvas_scroll_event (GdkEventScroll *event)
{
- gint x, y;
-
- /* this is the handler for events that are not handled by
- items.
- */
-
- switch (event->type) {
- case GDK_MOTION_NOTIFY:
- /* keep those motion events coming */
- track_canvas.get_pointer (x, y);
- return track_canvas_motion (event);
-
- case GDK_BUTTON_PRESS:
- track_canvas.grab_focus();
- break;
-
- case GDK_BUTTON_RELEASE:
- if (drag_info.item) {
- end_grab (drag_info.item, event);
- }
- break;
+ track_canvas.grab_focus();
+ track_canvas_scroll (event);
+ return false;
+}
- case GDK_SCROLL:
- track_canvas.grab_focus();
- track_canvas_scroll (&event->scroll);
- break;
+bool
+Editor::track_canvas_button_press_event (GdkEventButton *event)
+{
+ track_canvas.grab_focus();
+ return false;
+}
- default:
- break;
+bool
+Editor::track_canvas_button_release_event (GdkEventButton *event)
+{
+ if (drag_info.item) {
+ end_grab (drag_info.item, (GdkEvent*) event);
}
+ return false;
+}
+bool
+Editor::track_canvas_motion_notify_event (GdkEventMotion *event)
+{
+ int x, y;
+ /* keep those motion events coming */
+ track_canvas.get_pointer (x, y);
return false;
}
@@ -292,6 +290,7 @@ bool
Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item, AutomationTimeAxisView *atv)
{
bool ret = false;
+
switch (event->type) {
case GDK_BUTTON_PRESS: