From 3b38d7d8a614f73f61bbed65356ba6c158d54970 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 26 Mar 2015 11:48:13 -0400 Subject: [PATCH] Keep automation lines within their parent (#6215). --- gtk2_ardour/automation_line.cc | 2 +- gtk2_ardour/automation_region_view.cc | 4 ++-- gtk2_ardour/automation_time_axis.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index d5ed529ad8..ed0321a2d7 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -105,7 +105,7 @@ AutomationLine::AutomationLine (const string& name, terminal_points_can_slide = true; _height = 0; - group = new ArdourCanvas::Container (&parent); + group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple(0, 1.5)); CANVAS_DEBUG_NAME (group, "region gain envelope group"); line = new ArdourCanvas::PolyLine (group); diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc index 38a98aac72..7e330949de 100644 --- a/gtk2_ardour/automation_region_view.cc +++ b/gtk2_ardour/automation_region_view.cc @@ -96,7 +96,7 @@ AutomationRegionView::create_line (boost::shared_ptr lis _parameter, &_source_relative_time_converter)); _line->set_colors(); - _line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE)); + _line->set_height ((uint32_t)rint(trackview.current_height() - 2.5 - NAME_HIGHLIGHT_SIZE)); _line->set_visibility (AutomationLine::VisibleAspects (AutomationLine::Line|AutomationLine::ControlPoints)); _line->set_maximum_time (_region->length()); _line->set_offset (_region->start ()); @@ -235,7 +235,7 @@ AutomationRegionView::set_height (double h) RegionView::set_height(h); if (_line) { - _line->set_height ((uint32_t)rint(h - NAME_HIGHLIGHT_SIZE)); + _line->set_height ((uint32_t)rint(h - 2.5 - NAME_HIGHLIGHT_SIZE)); } } diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 5798344b8a..12876c1abb 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -465,7 +465,7 @@ AutomationTimeAxisView::set_height (uint32_t h, TrackHeightMode m) _base_rect->set_y1 (h); if (_line) { - _line->set_height(h); + _line->set_height(h - 2.5); } if (_view) {