From 8accb22923ab1b37823b17f5a602e7449bd3491b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 18 Apr 2014 05:07:20 -0400 Subject: [PATCH 1/2] put back bottom line of region views if name highlight is not shown. Also remove redundant line that replicated the one we modified. --- gtk2_ardour/time_axis_view_item.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 477d1dd70a..b697db733f 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -209,7 +209,11 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name())); - frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT)); + if (Config->get_show_name_highlight()) { + frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT)); + } else { + frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM)); + } if (_recregion) { frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect()); @@ -217,8 +221,6 @@ TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color cons frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame()); } - frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::LEFT)); - } else { frame = 0; From f108b40d53acde00d9a2df9540ae2b58c170c9fb Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 18 Apr 2014 05:07:43 -0400 Subject: [PATCH 2/2] correct fix to OS X build script for patchfiles (spelling error) --- tools/osx_packaging/osx_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 856a63cdfa..384eeeac3d 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -144,7 +144,7 @@ mkdir -p $Templates mkdir -p $Frameworks/modules mkdir -p $Etc mkdir -p $MackieControl -mkdir -p $Patchfiles +mkdir -p $PatchFiles # maybe set variables env=""