ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Disable region drags in internal edit mode. Fixes #3456. 

git-svn-id: svn://localhost/ardour2/branches/3.0@7800 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-09-18 20:22:03 +00:00
parent 157895dc3b
commit 74d72b83a7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor_drag.cc
View File

@ -365,6 +365,8 @@ RegionDrag::RegionDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<Re
}
}
}
assert (!v.empty ());
for (list<RegionView*>::const_iterator i = v.begin(); i != v.end(); ++i) {
_views.push_back (DraggingView (*i, this));
@ -759,6 +761,8 @@ RegionMoveDrag::finished (GdkEvent *, bool movement_occurred)
_x_constrained = !_x_constrained;
}
assert (!_views.empty ());
bool const changed_position = (_last_frame_position != _primary->region()->position());
bool const changed_tracks = (_time_axis_views[_views.front().time_axis_view] != &_views.front().view->get_time_axis_view());
framecnt_t const drag_delta = _primary->region()->position() - _last_frame_position;

5
gtk2_ardour/editor_mouse.cc
View File

@ -768,6 +768,11 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
*/
break;
}
if (internal_editing ()) {
/* no region drags in internal edit mode */
break;
}
/* click on a normal region view */
if (Keyboard::modifier_state_contains (event->button.state, Keyboard::CopyModifier)) {