From 49a32910c5506ec28f522e2bd2317c64520e8be9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 25 Jun 2012 21:19:06 +0000 Subject: [PATCH] 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 --- gtk2_ardour/midi_region_view.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index c0da287180..4212a3131c 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -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) ||