diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-07 13:06:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-07 13:06:29 +0000 |
| commit | a187460b07a5b82f0e482c736954397c418f56c5 (patch) | |
| tree | 0f76ba44872d769c0f5f694341daeb00a8b0555e | |
| parent | eabe5b31f88fc2723980cb812e836c02b296b80f (diff) | |
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
| -rw-r--r-- | gtk2_ardour/ardour3_ui_default.conf | 2 | ||||
| -rw-r--r-- | gtk2_ardour/stereo_panner.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf index 690495a40f..4f04a44708 100644 --- 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 cff4ebd898..3826dc1c7a 100644 --- 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 */ |