From 8c41fc7dd05c02a58208b8366866ccd0bd45f3ae Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 14 Feb 2022 21:02:26 -0600 Subject: [PATCH] meter ruler: match look of meter markers to tempo markers --- gtk2_ardour/marker.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 3dabdd8394..757bcc9391 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -204,7 +204,7 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3 points->push_back (ArdourCanvas::Duple ( M5, 0.0)); _shift = 5 * scale; - _label_offset = 8.0 * scale; + _label_offset = 12.0 * scale; break; case SessionStart: @@ -292,7 +292,7 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3 group->name = string_compose ("Marker::group for %1", annotation); #endif - if (type != RegionCue) { + if ((type != RegionCue) && (type != Meter)) { _name_flag = new ArdourCanvas::Rectangle (group); #ifdef CANVAS_DEBUG _name_flag->name = string_compose ("Marker::_name_flag for %1", annotation); @@ -637,8 +637,7 @@ ArdourMarker::set_color_rgba (uint32_t c) /* make sure text stands out over bg color */ _name_item->set_color (contrasting_text_color (_color)); } else { - /* make sure text is same color as everything else */ - _name_item->set_color (_color); + _name_item->set_color (RGBA_TO_UINT (255,255,255,255)); //white: matched to TempoCurve text } }