mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Timeline,Mixer: Tweak colors for light themes.

pull/119/merge
Jonathan Moore Liles 2020-10-17 15:29:12 -07:00
parent e42b50814a
commit b1d59fc68a
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mixer/src/DPM.C
View File

@ -51,6 +51,9 @@ DPM::DPM ( int X, int Y, int W, int H, const char *L ) :
dim( 0.85f ); dim( 0.85f );
box( FL_FLAT_BOX );
color( fl_color_average( FL_BLACK, FL_BACKGROUND_COLOR, 0.66f ) );
/* initialize gradients */ /* initialize gradients */
if ( DPM::_gradient[ 0 ] == 0 ) 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 ) 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); resize( X,Y,W,H);
} }

4
mixer/src/DPM.H
View File

@ -92,7 +92,7 @@ public:
static static
void 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++ ) for ( int i = 0; i < nbreaks - 1; i++ )
{ {
@ -102,6 +102,6 @@ public:
} }
for ( int i = 0; i < 128; i++ ) 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 );
} }
}; };

2
mixer/src/Panner.C
View File

@ -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("5 Meters",0,0,&ranges[2]);
o->add("10 Meters",0,0,&ranges[3]); o->add("10 Meters",0,0,&ranges[3]);
o->add("15 Meters",0,0,&ranges[4]); o->add("15 Meters",0,0,&ranges[4]);
o->textcolor( fl_contrast( FL_GRAY0, FL_FOREGROUND_COLOR ));
o->value(_range_mode); o->value(_range_mode);
o->callback( cb_mode, this ); 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("Spherical");
o->add("Planar"); o->add("Planar");
o->value(_projection_mode); o->value(_projection_mode);
o->textcolor( fl_contrast( FL_GRAY0, FL_FOREGROUND_COLOR ));
o->callback( cb_mode, this ); o->callback( cb_mode, this );
} }

2
timeline/src/Audio_Region.C
View File

@ -566,7 +566,7 @@ Audio_Region::draw ( void )
/* Audio_Region::inherit_track_color ? sequence()->track()->color() : _box_color, */ /* Audio_Region::inherit_track_color ? sequence()->track()->color() : _box_color, */
/* 0.75f ); */ /* 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_in, Fade::In, false, X, W );
draw_fade( _fade_out, Fade::Out, false, X, W ); draw_fade( _fade_out, Fade::Out, false, X, W );