From 70e517380c6471e5b40a5057eeb75b82b8b959b9 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 15 Dec 2014 09:05:25 -0500
Subject: [PATCH] add 22 modifiers to dark.colors and start using the first one
 (for crossfade alpha)

---
 gtk2_ardour/audio_region_view.cc |  8 ++++----
 gtk2_ardour/dark.colors          | 25 +++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index e29e0bd103..8a146520ec 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -737,7 +737,7 @@ AudioRegionView::redraw_start_xfade_to (boost::shared_ptr<AudioRegion> ar, frame
 	if (!start_xfade_curve) {
 		start_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::Start);
 		CANVAS_DEBUG_NAME (start_xfade_curve, string_compose ("xfade start out line for %1", region()->name()));
-		start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color ("active crossfade"));
+		start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
 		start_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
 		start_xfade_curve->set_ignore_events (true);
 	}
@@ -826,7 +826,7 @@ AudioRegionView::redraw_end_xfade_to (boost::shared_ptr<AudioRegion> ar, framecn
 	if (!end_xfade_curve) {
 		end_xfade_curve = new ArdourCanvas::XFadeCurve (group, ArdourCanvas::XFadeCurve::End);
 		CANVAS_DEBUG_NAME (end_xfade_curve, string_compose ("xfade end out line for %1", region()->name()));
-		end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color ("active crossfade"));
+		end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
 		end_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
 		end_xfade_curve->set_ignore_events (true);
 	}
@@ -994,11 +994,11 @@ AudioRegionView::set_colors ()
 	set_waveform_colors ();
 
 	if (start_xfade_curve) {
-		start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color ("active crossfade"));
+		start_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
 		start_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
 	}
 	if (end_xfade_curve) {
-		end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color ("active crossfade"));
+		end_xfade_curve->set_fill_color (ARDOUR_UI::config()->color_mod ("active crossfade", "crossfade alpha"));
 		end_xfade_curve->set_outline_color (ARDOUR_UI::config()->color ("crossfade line"));
 	}
 
diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors
index 3a83cc9f7b..f02c29c321 100644
--- a/gtk2_ardour/dark.colors
+++ b/gtk2_ardour/dark.colors
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- The Dark Theme for Ardour -->
 
 <Ardour>
@@ -12,7 +13,7 @@
     <Color name="meter color7" value="0xFF8800ff"/>
     <Color name="meter color8" value="0xFF0000ff"/>
     <Color name="meter color9" value="0xFF0000ff"/>
-    <Color name="color 1" value="0x20b2b22e"/>
+    <Color name="color 1" value="0x20b2b2ff"/>
     <Color name="color 10" value="0xf0f0f0ff"/>
     <Color name="color 100" value="0xe49c9cc9"/>
     <Color name="color 101" value="0xa06000ff"/>
@@ -483,6 +484,26 @@
     <ColorAlias name="zoom button: led active" alias="color 8"/>
   </ColorAliases>    
   <Modifiers>
-    <Modifer name="region note edit" modifier="= alpha:0"/>
+    <Modifier name="crossfade alpha" modifier="= alpha:0.1803"/>
+    <Modifier name="modifier 100" modifier="= alpha:0.7882"/>
+    <Modifier name="modifier 102" modifier="= alpha:0.8"/>
+    <Modifier name="modifier 103" modifier="= alpha:0.9764"/>
+    <Modifier name="modifier 105" modifier="= alpha:3137"/>
+    <Modifier name="modifier 11" 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"/>
+    <Modifier name="modifier 32" modifier="= alpha:0.4666"/>
+    <Modifier name="modifier 45" modifier="= alpha:0.4627"/>
+    <Modifier name="modifier 5" modifier="= alpha:0.4078"/>
+    <Modifier name="modifier 51" modifier="= alpha:0.4"/>
+    <Modifier name="modifier 60" modifier="= alpha:0.6274"/>
+    <Modifier name="modifier 61" modifier="= alpha:0.7529"/>
+    <Modifier name="modifier 62" modifier="= alpha:0.5333"/>
+    <Modifier name="modifier 65" modifier="= alpha:0.3725"/>
+    <Modifier name="modifier 74" modifier="= alpha:0.7882"/>
+    <Modifier name="modifier 76" modifier="= alpha:0.4196"/>
+    <Modifier name="modifier 95" modifier="= alpha:0.4666"/>
+    <Modifier name="modifier 98" modifier="= alpha:0.4784"/>
   </Modifiers>
 </Ardour>