[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 ************
This commit is contained in:
Valeriy Kamyshniy 2015-02-16 02:46:52 +02:00
parent 5e28feda1a
commit a8895b0d14

View file

@ -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);
}