diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
| commit | cb413146428ce5db5e281d70f2b3b7df27c1aaab (patch) | |
| tree | 4961e9dcb107f2ca1f0a4298faf5135ba8611d92 /gtk2_ardour/editor_imageframe.cc | |
| parent | 9aa8af5a28abbb86c9ae86c6991838eb6828d0a9 (diff) | |
merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_imageframe.cc')
| -rw-r--r-- | gtk2_ardour/editor_imageframe.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc index 68d061696e..daba2496a0 100644 --- a/gtk2_ardour/editor_imageframe.cc +++ b/gtk2_ardour/editor_imageframe.cc @@ -430,7 +430,8 @@ Editor::start_imageframe_grab(ArdourCanvas::Item* item, GdkEvent* event) drag_info.finished_callback = &Editor::timeaxis_item_drag_finished_callback; drag_info.last_frame_position = ifv->get_position() ; - drag_info.last_trackview = &ifv->get_time_axis_view() ; + drag_info.source_trackview = &ifv->get_time_axis_view() ; + drag_info.dest_trackview = drag_info.source_trackview; /* this is subtle. raising the regionview itself won't help, because raise_to_top() just puts the item on the top of @@ -442,7 +443,7 @@ Editor::start_imageframe_grab(ArdourCanvas::Item* item, GdkEvent* event) */ drag_info.item->raise_to_top(); - drag_info.last_trackview->canvas_display->raise_to_top(); + drag_info.source_trackview->canvas_display->raise_to_top(); //time_line_group->raise_to_top(); cursor_group->raise_to_top (); @@ -463,7 +464,8 @@ Editor::start_markerview_grab(ArdourCanvas::Item* item, GdkEvent* event) drag_info.finished_callback = &Editor::timeaxis_item_drag_finished_callback; drag_info.last_frame_position = mv->get_position() ; - drag_info.last_trackview = &mv->get_time_axis_view() ; + drag_info.source_trackview = &mv->get_time_axis_view() ; + drag_info.dest_trackview = drag_info.source_trackview; /* this is subtle. raising the regionview itself won't help, because raise_to_top() just puts the item on the top of @@ -475,7 +477,7 @@ Editor::start_markerview_grab(ArdourCanvas::Item* item, GdkEvent* event) */ drag_info.item->raise_to_top(); - drag_info.last_trackview->canvas_display->raise_to_top(); + drag_info.source_trackview->canvas_display->raise_to_top(); //time_line_group->raise_to_top(); cursor_group->raise_to_top (); |