use the same color for the stereo panner center line as the mono panner

git-svn-id: svn://localhost/ardour2/branches/3.0@9091 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf
index 690495a40f3781c5d4ed17ae94a0a2d66047b99f..4f04a44708dedca4bd7f2c5cabffa3e53798c43a 100644 (file)
--- a/gtk2_ardour/ardour3_ui_default.conf
+++ b/gtk2_ardour/ardour3_ui_default.conf
@@ -112,7 +112,7 @@
     <Option name="stereo panner fill" value="8ea2d7c9"/>
     <Option name="stereo panner text" value="000000ff"/>
     <Option name="stereo panner bg" value="2e2929ff"/>
-    <Option name="stereo panner rule" value="b5a594ff"/>
+    <Option name="stereo panner rule" value="6a6565ff"/>
     <Option name="stereo panner mono outline" value="a05600ff"/>
     <Option name="stereo panner mono fill" value="e99668ca"/>
     <Option name="stereo panner mono text" value="000000ff"/>

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index cff4ebd898a4b536bf85dc5616e6edd811852253..3826dc1c7a1ac1b7a1d031f6731c92f76e65c10e 100644 (file)
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -140,7 +140,7 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         double pos = position_control->get_value (); /* 0..1 */
         double swidth = width_control->get_value (); /* -1..+1 */
         double fswidth = fabs (swidth);
-        uint32_t o, f, t, b;
+        uint32_t o, f, t, b, r;
         State state;
         const double corner_radius = 5.0;
 
@@ -159,6 +159,7 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         f = colors[state].fill;
         t = colors[state].text;
         b = colors[state].background;
+        r = colors[state].rule;
 
         /* background */
 
@@ -197,7 +198,7 @@ StereoPanner::on_expose_event (GdkEventExpose* ev)
         context->set_line_width (1.0);
         context->move_to ((usable_width + lr_box_size)/2.0, 0);
         context->rel_line_to (0, height);
-        context->set_source_rgba (UINT_RGBA_R_FLT(o), UINT_RGBA_G_FLT(o), UINT_RGBA_B_FLT(o), UINT_RGBA_A_FLT(o));
+        context->set_source_rgba (UINT_RGBA_R_FLT(r), UINT_RGBA_G_FLT(r), UINT_RGBA_B_FLT(r), UINT_RGBA_A_FLT(r));
         context->stroke ();
 
         /* compute & draw the line through the box */