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

Mixer: Tweak meter appearance.

pull/119/merge
Jonathan Moore Liles 2020-10-23 22:05:46 -07:00
parent ad6dbba07c
commit a9846d1fc3
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mixer/src/DPM.C
View File

@ -49,7 +49,7 @@ DPM::DPM ( int X, int Y, int W, int H, const char *L ) :
// resize( X, Y, W, H ); // resize( X, Y, W, H );
dim( 0.85f ); dim( 0.95f );
box( FL_NO_BOX ); box( FL_NO_BOX );
color( fl_color_average( FL_BLACK, FL_BACKGROUND_COLOR, 0.66f ) ); color( fl_color_average( FL_BLACK, FL_BACKGROUND_COLOR, 0.66f ) );
@ -57,18 +57,26 @@ DPM::DPM ( int X, int Y, int W, int H, const char *L ) :
/* initialize gradients */ /* initialize gradients */
if ( DPM::_gradient[ 0 ] == 0 ) if ( DPM::_gradient[ 0 ] == 0 )
{ {
int breaks[] = {0,60,70,80,90,127}; int breaks[] = {0,80,90,110,127};
Fl_Color cols[] = { Fl_Color cols[] = {
fl_rgb_color( 45,58,64), fl_darker( FL_CYAN ),
fl_rgb_color( 84,181,195 ), FL_CYAN,
fl_rgb_color( 122,200,211 ), fl_lighter( FL_CYAN ),
fl_rgb_color( 178,213,212 ), fl_color_average( FL_YELLOW, FL_RED, 0.50f ),
fl_rgb_color( 209,213,179 ), FL_RED
fl_rgb_color( 250, 40, 30 )
}; };
DPM::blend( 6, breaks, cols, color() ); for ( int i = 0; i < 4; ++i )
{
cols[i] = fl_color_average( cols[i], FL_BACKGROUND_COLOR, 0.60f );
}
DPM::blend( 5,
breaks,
cols,
color() );
} }
{ {
@ -244,19 +252,19 @@ DPM::draw ( void )
fl_rectf( X, yy, W, bh, c ); fl_rectf( X, yy, W, bh, c );
} }
/* if ( _pixels_per_segment >= 3 ) */ if ( _pixels_per_segment >= 3 )
/* { */ {
/* fl_color( FL_CYAN ); */ fl_color( FL_BLACK );
/* if ( type() == FL_HORIZONTAL ) */ if ( type() == FL_HORIZONTAL )
/* { */ {
/* fl_line( xx, Y, xx, Y + H - 1 ); */ fl_line( xx, Y, xx, Y + H - 1 );
/* } */ }
/* else */ else
/* { */ {
/* fl_line( X, yy, X + W - 1, yy ); */ fl_line( X, yy, X + W - 1, yy );
/* } */ }
/* } */ }
/* } */ /* } */
/* else */ /* else */

2
mixer/src/Meter_Indicator_Module.C
View File

@ -57,7 +57,7 @@ Meter_Indicator_Module::Meter_Indicator_Module ( bool is_default )
dpm_pack->color( FL_BACKGROUND_COLOR ); dpm_pack->color( FL_BACKGROUND_COLOR );
dpm_pack->box( FL_FLAT_BOX ); dpm_pack->box( FL_FLAT_BOX );
dpm_pack->type( FL_HORIZONTAL ); dpm_pack->type( FL_HORIZONTAL );
dpm_pack->spacing(1); dpm_pack->spacing(2);
end(); end();