smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity

merge 3170-3180 of 2.X into 3.0

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4301 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2008-12-08 17:09:57 +00:00
parent 3be16e8afb
commit 23294003f0
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/editor_mouse.cc
View file

@ -4001,8 +4001,11 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
continue; 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) { if (changed_position && !drag_info.x_constrained) {
where = rv->region()->position() - drag_delta; where = (nframes_t) unit_to_frame (ix1);
} else { } else {
where = rv->region()->position(); where = rv->region()->position();
} }

1
gtk2_ardour/editor_rulers.cc
View file

@ -728,6 +728,7 @@ Editor::update_ruler_visibility ()
range_marker_bar_group->show(); range_marker_bar_group->show();
range_marker_group->show(); range_marker_group->show();
range_mark_label.show(); range_mark_label.show();
tbpos += timebar_height; tbpos += timebar_height;
tbgpos += timebar_height; tbgpos += timebar_height;
visible_timebars++; visible_timebars++;

1
gtk2_ardour/time_axis_view.cc
View file

@ -560,7 +560,6 @@ TimeAxisView::conditionally_add_to_selection ()
} }
} }
void void
TimeAxisView::popup_display_menu (guint32 when) TimeAxisView::popup_display_menu (guint32 when)
{ {