From a8895b0d141c522ed8e860fdb8528a7a8c884e95 Mon Sep 17 00:00:00 2001 From: Valeriy Kamyshniy Date: Mon, 16 Feb 2015 02:46:52 +0200 Subject: [PATCH] [Summary] Bug fixes: Zoom Tool should not have any effect on the Marker lanes and anything but the region view. MarkerDrag/Left(Right)DragHandle looks not one to combine with other instances of MarkerItem drags. ******** REVIEW FROM PAUL IS REQUIRED ************ --- gtk2_ardour/editor_mouse.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 745b987c53..02c7270bbc 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -659,12 +659,14 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT return true; case LeftDragHandle: - _drags->set (new MarkerDrag (this, item, MarkerDrag::TrimLeft), event); - break; + _drags->set (new MarkerDrag (this, item, MarkerDrag::TrimLeft), event); + return true; + break; case RightDragHandle: - _drags->set (new MarkerDrag (this, item, MarkerDrag::TrimRight), event); - break; + _drags->set (new MarkerDrag (this, item, MarkerDrag::TrimRight), event); + return true; + break; case TempoMarkerItem: { @@ -1242,7 +1244,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case MouseZoom: - if (event->type == GDK_BUTTON_PRESS) { + if (entered_regionview && (event->type == GDK_BUTTON_PRESS)) { _drags->set (new MouseZoomDrag (this, item), event); }