diff options
author | David Robillard <d@drobilla.net> | 2014-12-16 00:02:06 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-12-16 00:02:06 -0500 |
commit | e90ecdd5c55a6e9a2f24a6fa36b53e3581094bcb (patch) | |
tree | 603a894f0d3c223566165b25876acfad9070b676 | |
parent | f8ae456aaa09757ad5a6072352b7b1d571f23031 (diff) |
Fix marker bars "gradient" colors.
-rw-r--r-- | gtk2_ardour/dark.colors | 16 | ||||
-rw-r--r-- | gtk2_ardour/editor_canvas.cc | 6 |
2 files changed, 10 insertions, 12 deletions
diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors index 7a092a5109..0f25633a0e 100644 --- a/gtk2_ardour/dark.colors +++ b/gtk2_ardour/dark.colors @@ -135,7 +135,7 @@ <ColorAlias name="big clock: edited text" alias="color 8"/> <ColorAlias name="big clock: text" alias="color 10"/> <ColorAlias name="border color" alias="color 4"/> - <ColorAlias name="cd marker bar" alias="color 11"/> + <ColorAlias name="cd marker bar" alias="color 87"/> <ColorAlias name="clipped waveform" alias="color 9"/> <ColorAlias name="clock: background" alias="color 67"/> <ColorAlias name="clock: cursor" alias="color 8"/> @@ -223,8 +223,8 @@ <ColorAlias name="location range" alias="color 41"/> <ColorAlias name="lock button: fill active" alias="color 42"/> <ColorAlias name="lock button: led active" alias="color 4"/> - <ColorAlias name="marker bar" alias="color 11"/> - <ColorAlias name="marker bar separator" alias="color 2"/> + <ColorAlias name="marker bar" alias="color 2"/> + <ColorAlias name="marker bar separator" alias="color 27"/> <ColorAlias name="marker drag line" alias="color 44"/> <ColorAlias name="marker label" alias="color 4"/> <ColorAlias name="marker track" alias="color 31"/> @@ -232,7 +232,7 @@ <ColorAlias name="measure line beat" alias="color 45"/> <ColorAlias name="meter background bottom" alias="color 46"/> <ColorAlias name="meter background top" alias="color 34"/> - <ColorAlias name="meter bar" alias="color 29"/> + <ColorAlias name="meter bar" alias="color 7"/> <ColorAlias name="meter color BBC" alias="color 8"/> <ColorAlias name="meter marker" alias="color 19"/> <ColorAlias name="meterbridge label: fill" alias="color 34"/> @@ -361,7 +361,7 @@ <ColorAlias name="punch line" alias="color 83"/> <ColorAlias name="range drag bar rect" alias="color 21"/> <ColorAlias name="range drag rect" alias="color 56"/> - <ColorAlias name="range marker bar" alias="color 3"/> + <ColorAlias name="range marker bar" alias="color 34"/> <ColorAlias name="record enable button: fill active" alias="color 83"/> <ColorAlias name="record enable button: led active" alias="color 85"/> <ColorAlias name="recording waveform fill" alias="color 13"/> @@ -435,7 +435,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="tempo bar" alias="color 29"/> + <ColorAlias name="tempo bar" alias="color 46"/> <ColorAlias name="tempo marker" alias="color 19"/> <ColorAlias name="time axis frame" alias="color 4"/> <ColorAlias name="time stretch fill" alias="color 26"/> @@ -457,7 +457,7 @@ <ColorAlias name="transport delta clock: text" alias="color 92"/> <ColorAlias name="transport drag rect" alias="color 21"/> <ColorAlias name="transport loop rect" alias="color 103"/> - <ColorAlias name="transport marker bar" alias="color 11"/> + <ColorAlias name="transport marker bar" alias="color 25"/> <ColorAlias name="transport option button: fill active" alias="color 42"/> <ColorAlias name="transport option button: led active" alias="color 8"/> <ColorAlias name="transport punch rect" alias="color 80"/> @@ -479,13 +479,11 @@ <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="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="gain line inactive" modifier="= alpha:0.7725"/> <Modifier name="ghost track base" modifier="= alpha:0.7764"/> <Modifier name="audio bus base" modifier="= alpha:0.4078"/> - <Modifier name="range marker bar" modifier="= alpha:0.4078"/> <Modifier name="inactive crossfade" modifier="= alpha:0.4666"/> <Modifier name="midi note velocity text" modifier="= alpha:0.4666"/> <Modifier name="midi sysex fill" modifier="= alpha:0.4666"/> diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index d067bb2fdf..0c2faf8213 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -890,13 +890,13 @@ 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_mod ("marker bar", "marker_bar")); + marker_bar->set_fill_color (ARDOUR_UI::config()->color ("marker bar")); marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); - cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("cd marker bar", "marker_bar")); + cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("cd 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_mod ("range marker bar", "range marker bar")); + range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("range marker bar")); range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("transport marker bar")); |