From 9916fa0c4f5e0d5ac0ee4c5e2334d29ec538854a Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Sun, 31 Jan 2010 19:14:54 -0600 Subject: [PATCH] Mixer: Make chains look better in the Light scheme. --- Mixer/Chain.C | 7 ++++--- Mixer/Module.C | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mixer/Chain.C b/Mixer/Chain.C index ab0cb27..651ffda 100644 --- a/Mixer/Chain.C +++ b/Mixer/Chain.C @@ -116,10 +116,11 @@ Chain::Chain ( ) : Fl_Group( 0, 0, 100, 100, "") { Fl_Group *o = chain_tab = new Fl_Group( X, Y, W, H, "" ); o->labeltype( FL_NO_LABEL ); o->box( FL_FLAT_BOX ); - o->color( fl_darker( FL_BACKGROUND_COLOR ) ); +// o->color( fl_darker( FL_BACKGROUND_COLOR ) ); +// o->color( FL_BACKGROUND_COLOR ); // o->box( FL_NO_BOX ); { Fl_Packscroller *o = new Fl_Packscroller( X, Y, W, H ); - o->color( fl_darker( FL_BACKGROUND_COLOR ) ); + o->color( FL_BACKGROUND_COLOR ); // o->box( FL_FLAT_BOX ); o->box( FL_THIN_UP_BOX ); o->type( Fl_Scroll::VERTICAL ); @@ -138,7 +139,7 @@ Chain::Chain ( ) : Fl_Group( 0, 0, 100, 100, "") o->labeltype( FL_NO_LABEL ); o->hide(); { Fl_Scroll *o = new Fl_Scroll( X, Y, W, H ); - o->color( fl_darker( FL_BACKGROUND_COLOR ) ); + o->color( FL_BACKGROUND_COLOR ); o->box( FL_FLAT_BOX ); o->type( Fl_Scroll::VERTICAL ); { Fl_Flowpack *o = controls_pack = new Fl_Flowpack( X, Y, W, H ); diff --git a/Mixer/Module.C b/Mixer/Module.C index 725fcb8..34a3fd7 100644 --- a/Mixer/Module.C +++ b/Mixer/Module.C @@ -304,7 +304,7 @@ Module::set_parameters ( const char *parameters ) void Module::draw_box ( void ) { - fl_color( FL_WHITE ); + fl_color( fl_contrast( FL_FOREGROUND_COLOR, color() ) ); int tw, th, tx, ty; @@ -362,10 +362,9 @@ Module::draw_label ( void ) Fl_Color c = FL_FOREGROUND_COLOR; if ( bypass() || ! active() ) - c = FL_BLACK; - fl_color( c ); + fl_color( fl_contrast( c, is_default() ? FL_BLACK : color() ) ); char *s = NULL;