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

next modifier

This commit is contained in:
Paul Davis 2014-12-15 10:00:20 -05:00
parent 3b863af475
commit ccbedaee51
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/dark.colors
View File

@ -19,7 +19,7 @@
<Color name="color 101" value="0xa06000ff"/>
<Color name="color 103" value="0x1e7727ff"/>
<Color name="color 104" value="0x7f7f7fff"/>
<Color name="color 11" value="0x9496a3cc"/>
<Color name="color 11" value="0x9496a3ff"/>
<Color name="color 12" value="0x18ab27ff"/>
<Color name="color 13" value="0xffffffff"/>
<Color name="color 14" value="0x55ccccff"/>
@ -485,7 +485,9 @@
<Modifier name="crossfade alpha" modifier="= alpha:0.1803"/>
<Modifier name="stereo panner inverted" modifier="= alpha:0.7882"/>
<Modifier name="loop rectangle" modifier="= alpha:0.9764"/>
<Modifier name="modifier 11" modifier="= alpha:0.8"/>
<Modifier name="marker bar" modifier="= alpha:0.8"/>
<Modifier name="mono panner position fill" modifier="= alpha:0.8"/>
<Modifier name="region base" modifier="= alpha:0.8"/>
<Modifier name="modifier 24" modifier="= alpha:0.7725"/>
<Modifier name="modifier 28" modifier="= alpha:0.7764"/>
<Modifier name="modifier 3" modifier="= alpha:0.4078"/>

4
gtk2_ardour/editor_canvas.cc
View File

@ -890,10 +890,10 @@ Editor::color_handler()
tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("tempo bar"));
tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
marker_bar->set_fill_color (ARDOUR_UI::config()->color ("marker bar"));
marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("marker bar", "marker_bar"));
marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("cd marker bar"));
cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("cd marker bar", "marker_bar"));
cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("range marker bar"));

2
gtk2_ardour/mono_panner.cc
View File

@ -492,7 +492,7 @@ MonoPanner::set_colors ()
colors.text = ARDOUR_UI::config()->color ("mono panner text");
colors.background = ARDOUR_UI::config()->color ("mono panner bg");
colors.pos_outline = ARDOUR_UI::config()->color ("mono panner position outline");
colors.pos_fill = ARDOUR_UI::config()->color ("mono panner position fill");
colors.pos_fill = ARDOUR_UI::config()->color_mod ("mono panner position fill", "mono panner position fill");
}
void

4
gtk2_ardour/time_axis_view_item.cc
View File

@ -729,7 +729,7 @@ TimeAxisViewItem::fill_opacity () const
return 130;
}
uint32_t col = ARDOUR_UI::config()->color ("region base");
uint32_t col = ARDOUR_UI::config()->color_mod ("region base", "region base");
return UINT_RGBA_A (col);
}
@ -759,7 +759,7 @@ TimeAxisViewItem::get_fill_color () const
f = ARDOUR_UI::config()->color ("recording rect");
} else {
if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
f = ARDOUR_UI::config()->color ("region base");
f = ARDOUR_UI::config()->color_mod ("region base", "region base");
} else {
f = fill_color;
}