diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-15 10:00:20 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-15 10:00:20 -0500 |
| commit | ccbedaee51fb5685311a34c8e8fb45d3c6336a7b (patch) | |
| tree | c75c82e85bb6dbc55553ea53d2a38fd32baeab2b /gtk2_ardour | |
| parent | 3b863af475687a75aab0abed495559c1c020f95c (diff) | |
next modifier
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/dark.colors | 6 | ||||
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/mono_panner.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors index 752638cd26..4d9a7fda22 100644 --- a/gtk2_ardour/dark.colors +++ b/gtk2_ardour/dark.colors @@ -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"/> diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 5c5bade059..73e97d44db 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -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")); diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc index 82e60b5959..f98f9440b3 100644 --- a/gtk2_ardour/mono_panner.cc +++ b/gtk2_ardour/mono_panner.cc @@ -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 diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 7274a7df77..60b39e1c71 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -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; } |