From 7baa3275e062e55199146a37e910d62d843bac4f Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 1 Nov 2014 21:05:43 +0100 Subject: [PATCH] one off by one off - red-selection outline This mitigates issues introduced with 3.5-3406-g90872c2 but is not a final solution. The x-axis is still broken. see #5589 comment0015955 --- gtk2_ardour/audio_region_view.cc | 4 ++-- gtk2_ardour/time_axis_view_item.cc | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index ced48920e0..ba140c4dc3 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -643,8 +643,8 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr ar, /* Put the fade out handle so that its right side is at the end-of-fade line; */ - fade_out_handle->set_x0 (1 + handle_right - handle_size); - fade_out_handle->set_x1 (1 + handle_right); + fade_out_handle->set_x0 (handle_right - handle_size); + fade_out_handle->set_x1 (handle_right); if (fade_out_trim_handle) { fade_out_trim_handle->set_x0 (1 + trim_handle_right - handle_size); fade_out_trim_handle->set_x1 (1 + trim_handle_right); diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 063fc73057..dbcdca4a75 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -63,7 +63,7 @@ Pango::FontDescription TimeAxisViewItem::NAME_FONT; const double TimeAxisViewItem::NAME_X_OFFSET = 15.0; const double TimeAxisViewItem::GRAB_HANDLE_TOP = 0.0; const double TimeAxisViewItem::GRAB_HANDLE_WIDTH = 10.0; -const double TimeAxisViewItem::RIGHT_EDGE_SHIFT = 1.0; +const double TimeAxisViewItem::RIGHT_EDGE_SHIFT = 0.0; // TODO remove, fixed in 3.5-3406-g90872c2, but may need further work. int TimeAxisViewItem::NAME_HEIGHT; double TimeAxisViewItem::NAME_Y_OFFSET; @@ -547,6 +547,7 @@ TimeAxisViewItem::set_selected(bool yn) if (frame) { if (!Config->get_show_name_highlight() && yn) { frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM|ArdourCanvas::Rectangle::TOP)); + frame->set_y0 (1.0); frame->set_y1 (_height - 1.0); } else { if (Config->get_show_name_highlight()) { @@ -554,6 +555,7 @@ TimeAxisViewItem::set_selected(bool yn) } else { frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM)); } + frame->set_y0 (0.0); frame->set_y1 (_height); } } @@ -609,6 +611,7 @@ TimeAxisViewItem::set_height (double height) if (frame) { if (!Config->get_show_name_highlight() && _selected) { frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM|ArdourCanvas::Rectangle::TOP)); + frame->set_y0 (1.0); frame->set_y1 (_height - 1.0); } else { if (Config->get_show_name_highlight()) { @@ -616,6 +619,7 @@ TimeAxisViewItem::set_height (double height) } else { frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM)); } + frame->set_y0 (0.0); frame->set_y1 (_height); }