ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

allow theme control of sync mark colors

This commit is contained in:
Paul Davis 2014-12-19 10:07:20 -05:00
parent b73477b250
commit f20933b80f
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk2_ardour/dark.colors
View File

@ -434,6 +434,7 @@
<ColorAlias name="stereo panner outline" alias="color 70"/>
<ColorAlias name="stereo panner rule" alias="color 70"/>
<ColorAlias name="stereo panner text" alias="color 4"/>
<ColorAlias name="sync mark" alias="color 75"/>
<ColorAlias name="tempo bar" alias="color 46"/>
<ColorAlias name="tempo marker" alias="color 19"/>
<ColorAlias name="time axis frame" alias="color 4"/>

17
gtk2_ardour/region_view.cc
View File

@ -514,11 +514,17 @@ void
RegionView::set_colors ()
{
TimeAxisViewItem::set_colors ();
set_sync_mark_color ();
}
void
RegionView::set_sync_mark_color ()
{
if (sync_mark) {
/* XXX: make these colours themable */
sync_mark->set_fill_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0));
sync_line->set_outline_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0));
ArdourCanvas::Color c = ARDOUR_UI::config()->color ("sync mark");
sync_mark->set_fill_color (c);
sync_mark->set_outline_color (c);
sync_line->set_outline_color (c);
}
}
@ -619,11 +625,10 @@ RegionView::region_sync_changed ()
sync_mark = new ArdourCanvas::Polygon (group);
CANVAS_DEBUG_NAME (sync_mark, string_compose ("sync mark for %1", get_item_name()));
sync_mark->set_fill_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); // FIXME make a themeable colour
sync_line = new ArdourCanvas::Line (group);
CANVAS_DEBUG_NAME (sync_line, string_compose ("sync mark for %1", get_item_name()));
sync_line->set_outline_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); // FIXME make a themeable colour
set_sync_mark_color ();
}
/* this has to handle both a genuine change of position, a change of samples_per_pixel

1
gtk2_ardour/region_view.h
View File

@ -151,6 +151,7 @@ class RegionView : public TimeAxisViewItem
void lock_toggle ();
virtual void set_colors ();
virtual void set_sync_mark_color ();
virtual void reset_width_dependent_items (double pixel_width);
virtual void color_handler () {}