diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-07-30 23:58:25 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-07-30 23:58:25 +0000 |
| commit | 9e1eed55aa9120b77cba28f67de93901a7fe10a5 (patch) | |
| tree | 17ea59d42f99d4d0194084dde7e0bfc4dc10df3a /gtk2_ardour | |
| parent | f59870b49f9af67dcf47cabac092ec87f25a446b (diff) | |
fix some aspects of midi region view event handling
git-svn-id: svn://localhost/ardour2/trunk@2192 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/canvas-midi-event.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/canvas-midi-event.cc b/gtk2_ardour/canvas-midi-event.cc index 823b1a718b..6c5c0598f3 100644 --- a/gtk2_ardour/canvas-midi-event.cc +++ b/gtk2_ardour/canvas-midi-event.cc @@ -74,6 +74,7 @@ CanvasMidiEvent::on_event(GdkEvent* ev) case GDK_MOTION_NOTIFY: event_x = ev->motion.x; event_y = ev->motion.y; + cerr << "MOTION @ " << event_x << ", " << event_y << endl; _item->property_parent().get_value()->w2i(event_x, event_y); switch (_state) { diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 78e0b6e539..3110cdd600 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -102,7 +102,7 @@ MidiRegionView::init (Gdk::Color& basic_color, bool wfd) midi_region()->midi_source(0)->model()->ContentsChanged.connect(sigc::mem_fun( this, &MidiRegionView::redisplay_model)); - group->signal_event().connect (mem_fun (this, &MidiRegionView::canvas_event)); + group->signal_event().connect (mem_fun (this, &MidiRegionView::canvas_event), false); } bool @@ -116,7 +116,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) if (trackview.editor.current_mouse_mode() != MouseNote) return false; - + switch (ev->type) { case GDK_BUTTON_PRESS: //group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, ev->button.time); @@ -128,7 +128,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) return true; case GDK_MOTION_NOTIFY: - cerr << "MOTION\n"; + cerr << "MOTION, _state = " << _state << endl; event_x = ev->motion.x; event_y = ev->motion.y; group->w2i(event_x, event_y); @@ -136,8 +136,8 @@ MidiRegionView::canvas_event(GdkEvent* ev) switch (_state) { case Pressed: cerr << "SELECT DRAG START\n"; - //group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, - // Gdk::Cursor(Gdk::FLEUR), ev->motion.time); + group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, + Gdk::Cursor(Gdk::FLEUR), ev->motion.time); _state = Dragging; last_x = event_x; last_y = event_y; @@ -166,7 +166,7 @@ MidiRegionView::canvas_event(GdkEvent* ev) case GDK_BUTTON_RELEASE: cerr << "RELEASE\n"; - //group->ungrab(ev->button.time); + group->ungrab(ev->button.time); switch (_state) { case Pressed: cerr << "CLICK\n"; |