From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 15 Dec 2014 15:43:39 +0000 (-0500)
Subject: next modifier
X-Git-Tag: 4.0-rc1~985
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=eac478495ec0084ba143d309e2e995ef4d5d98ab;p=ardour.git

next modifier
---

diff --git a/gtk2_ardour/dark.colors b/gtk2_ardour/dark.colors
index b5030e2e0b..1d54086838 100644
--- a/gtk2_ardour/dark.colors
+++ b/gtk2_ardour/dark.colors
@@ -87,7 +87,7 @@
     <Color name="color 71" value="0x5f5a58ff"/>
     <Color name="color 72" value="0xe58b05ff"/>
     <Color name="color 73" value="0x3240c0ff"/>
-    <Color name="color 74" value="0x7a9bccc9"/>
+    <Color name="color 74" value="0x7a9bccff"/>
     <Color name="color 75" value="0xbba900ff"/>
     <Color name="color 76" value="0x6c6e6a6b"/>
     <Color name="color 77" value="0x7aadf9ff"/>
@@ -494,7 +494,7 @@
     <Modifier name="midi patch change fill" modifier="= alpha:0.6274"/>
     <Modifier name="stereo panner inverted bg" modifier="= alpha:0.7529"/>
     <Modifier name="midi track base" modifier="= alpha:0.3725"/>
-    <Modifier name="modifier 74" modifier="= alpha:0.7882"/>
+    <Modifier name="panner fill" 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"/>
diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index f98f9440b3..0d9981dcf8 100644
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -487,7 +487,7 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
 void
 MonoPanner::set_colors ()
 {
-        colors.fill = ARDOUR_UI::config()->color ("mono panner fill");
+        colors.fill = ARDOUR_UI::config()->color_mod ("mono panner fill", "panner fill");
         colors.outline = ARDOUR_UI::config()->color ("mono panner outline");
         colors.text = ARDOUR_UI::config()->color ("mono panner text");
         colors.background = ARDOUR_UI::config()->color ("mono panner bg");
diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index b9bb430481..43dd294d43 100644
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -670,7 +670,7 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
 void
 StereoPanner::set_colors ()
 {
-	colors[Normal].fill = ARDOUR_UI::config()->color ("stereo panner fill");
+	colors[Normal].fill = ARDOUR_UI::config()->color_mod ("stereo panner fill", "panner fill");
 	// colors[Normal].outline = ARDOUR_UI::config()->color ("stereo panner outline");
 	colors[Normal].outline = ArdourCanvas::HSV (colors[Normal].fill).outline().color ();
 	colors[Normal].text = ARDOUR_UI::config()->color ("stereo panner text");