Patch from tophatdave to prevent exit from note edit

mode on double-click with a modifier held down;
prevents creation of malformed notes (#4664).


git-svn-id: svn://localhost/ardour2/branches/3.0@12929 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-06-25 21:19:06 +00:00
parent 2b559c41ae
commit 49a32910c5

View file

@ -337,7 +337,12 @@ MidiRegionView::canvas_event(GdkEvent* ev)
}
if (ev->type == GDK_2BUTTON_PRESS) {
return trackview.editor().toggle_internal_editing_from_double_click (ev);
// cannot use double-click to exit internal mode if single-click is being used
MouseMode m = trackview.editor().current_mouse_mode();
if ((m != MouseObject || !Keyboard::modifier_state_contains (ev->button.state, Keyboard::insert_note_modifier())) && (m != MouseDraw)) {
return trackview.editor().toggle_internal_editing_from_double_click (ev);
}
}
if ((!trackview.editor().internal_editing() && trackview.editor().current_mouse_mode() != MouseGain) ||