diff --git a/mixer/src/DPM.C b/mixer/src/DPM.C index 35edf23..3a50e1b 100644 --- a/mixer/src/DPM.C +++ b/mixer/src/DPM.C @@ -51,6 +51,9 @@ DPM::DPM ( int X, int Y, int W, int H, const char *L ) : dim( 0.85f ); + box( FL_FLAT_BOX ); + color( fl_color_average( FL_BLACK, FL_BACKGROUND_COLOR, 0.66f ) ); + /* initialize gradients */ if ( DPM::_gradient[ 0 ] == 0 ) { @@ -65,11 +68,9 @@ DPM::DPM ( int X, int Y, int W, int H, const char *L ) : fl_rgb_color( 250, 40, 30 ) }; - DPM::blend( 6, breaks, cols ); + DPM::blend( 6, breaks, cols, color() ); } - box( FL_FLAT_BOX ); - color( FL_BACKGROUND_COLOR ); resize( X,Y,W,H); } diff --git a/mixer/src/DPM.H b/mixer/src/DPM.H index 03f24bb..e41ad3f 100644 --- a/mixer/src/DPM.H +++ b/mixer/src/DPM.H @@ -92,7 +92,7 @@ public: static void - blend ( int nbreaks, int* b, Fl_Color *c ) + blend ( int nbreaks, int* b, Fl_Color *c, Fl_Color bc ) { for ( int i = 0; i < nbreaks - 1; i++ ) { @@ -102,6 +102,6 @@ public: } for ( int i = 0; i < 128; i++ ) - _dim_gradient[ i ] = fl_color_average( FL_BLACK, _gradient[ i ], _dim ); + _dim_gradient[ i ] = fl_color_average( bc, _gradient[ i ], _dim ); } }; diff --git a/mixer/src/Panner.C b/mixer/src/Panner.C index 176f42a..ac83906 100644 --- a/mixer/src/Panner.C +++ b/mixer/src/Panner.C @@ -56,6 +56,7 @@ Panner::Panner ( int X, int Y, int W, int H, const char *L ) : o->add("5 Meters",0,0,&ranges[2]); o->add("10 Meters",0,0,&ranges[3]); o->add("15 Meters",0,0,&ranges[4]); + o->textcolor( fl_contrast( FL_GRAY0, FL_FOREGROUND_COLOR )); o->value(_range_mode); o->callback( cb_mode, this ); } @@ -69,6 +70,7 @@ Panner::Panner ( int X, int Y, int W, int H, const char *L ) : o->add("Spherical"); o->add("Planar"); o->value(_projection_mode); + o->textcolor( fl_contrast( FL_GRAY0, FL_FOREGROUND_COLOR )); o->callback( cb_mode, this ); } diff --git a/timeline/src/Audio_Region.C b/timeline/src/Audio_Region.C index 210e2f8..55c0057 100644 --- a/timeline/src/Audio_Region.C +++ b/timeline/src/Audio_Region.C @@ -566,7 +566,7 @@ Audio_Region::draw ( void ) /* Audio_Region::inherit_track_color ? sequence()->track()->color() : _box_color, */ /* 0.75f ); */ - fl_color( fl_color_add_alpha( FL_DARK1, 127 ) ); + fl_color( fl_color_add_alpha( fl_rgb_color( 20,20,20 ), 127 ) ); draw_fade( _fade_in, Fade::In, false, X, W ); draw_fade( _fade_out, Fade::Out, false, X, W );