smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

meter ruler: match look of meter markers to tempo markers

Browse source
This commit is contained in:
Ben Loftis 2022-02-14 21:02:26 -06:00
parent 49e792868f
commit 8c41fc7dd0
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/marker.cc
View file

@ -204,7 +204,7 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3
points->push_back (ArdourCanvas::Duple ( M5, 0.0)); points->push_back (ArdourCanvas::Duple ( M5, 0.0));
_shift = 5 * scale; _shift = 5 * scale;
_label_offset = 8.0 * scale; _label_offset = 12.0 * scale;
break; break;
case SessionStart: case SessionStart:
@ -292,7 +292,7 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Item& parent, guint3
group->name = string_compose ("Marker::group for %1", annotation); group->name = string_compose ("Marker::group for %1", annotation);
#endif #endif
if (type != RegionCue) { if ((type != RegionCue) && (type != Meter)) {
_name_flag = new ArdourCanvas::Rectangle (group); _name_flag = new ArdourCanvas::Rectangle (group);
#ifdef CANVAS_DEBUG #ifdef CANVAS_DEBUG
_name_flag->name = string_compose ("Marker::_name_flag for %1", annotation); _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 */ /* make sure text stands out over bg color */
_name_item->set_color (contrasting_text_color (_color)); _name_item->set_color (contrasting_text_color (_color));
} else { } else {
/* make sure text is same color as everything else */ _name_item->set_color (RGBA_TO_UINT (255,255,255,255)); //white: matched to TempoCurve text
_name_item->set_color (_color);
} }
} }