diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-09-18 20:22:03 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-09-18 20:22:03 +0000 |
| commit | 74d72b83a79f33a459d15e9f07164874c1e4d75f (patch) | |
| tree | 1f60b9323ec565323b1d71f0d3302726a626ddc9 /gtk2_ardour | |
| parent | 157895dc3b94fe88820ff4e15e848249aef723fc (diff) | |
Disable region drags in internal edit mode. Fixes #3456.
git-svn-id: svn://localhost/ardour2/branches/3.0@7800 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 6414c7cf5d..37f71c6026 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -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; diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 51064f87cc..a3eef66d72 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -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)) { |