merge 3170-3180 of 2.X into 3.0
git-svn-id: svn://localhost/ardour2/branches/3.0@4301 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
3be16e8afb
commit
23294003f0
@ -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();
|
||||
}
|
||||
|
@ -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++;
|
||||
|
@ -560,7 +560,6 @@ TimeAxisView::conditionally_add_to_selection ()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
TimeAxisView::popup_display_menu (guint32 when)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user