diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 17:09:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 17:09:57 +0000 |
| commit | 23294003f01db00f3896696fb3d8666774f3e14f (patch) | |
| tree | 943e31a5e9f0e8668c04f29e7152ff6b2f50d2c0 /gtk2_ardour | |
| parent | 3be16e8afbd891c0bfe7227158384ed0d127597f (diff) | |
merge 3170-3180 of 2.X into 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0@4301 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view.cc | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 1a03f66f24..81ca998a00 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -4001,8 +4001,11 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event continue; } + changed_position = (drag_info.last_frame_position != (nframes_t) (rv->region()->position())); + changed_tracks = (dest_tv != &rv->get_time_axis_view()); + if (changed_position && !drag_info.x_constrained) { - where = rv->region()->position() - drag_delta; + where = (nframes_t) unit_to_frame (ix1); } else { where = rv->region()->position(); } diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index f463d914f0..048d8c2725 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -728,6 +728,7 @@ Editor::update_ruler_visibility () range_marker_bar_group->show(); range_marker_group->show(); range_mark_label.show(); + tbpos += timebar_height; tbgpos += timebar_height; visible_timebars++; diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 42be403bf9..1887c6d7ea 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -560,7 +560,6 @@ TimeAxisView::conditionally_add_to_selection () } } - void TimeAxisView::popup_display_menu (guint32 when) { |