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

Mixer: Update for NTK transparency.

This commit is contained in:
Jonathan Moore Liles 2012-06-20 00:55:58 -07:00
parent 81217a8722
commit 870203b3dd
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mixer/src/DPM.C
View File

@ -55,7 +55,7 @@ DPM::DPM ( int X, int Y, int W, int H, const char *L ) :
if ( DPM::_gradient[ 0 ] == 0 ) if ( DPM::_gradient[ 0 ] == 0 )
DPM::blend( FL_GREEN, FL_RED ); DPM::blend( FL_GREEN, FL_RED );
box( FL_ROUNDED_BOX ); box( FL_FLAT_BOX );
color( FL_BACKGROUND_COLOR ); color( FL_BACKGROUND_COLOR );
} }

4
mixer/src/Meter_Indicator_Module.C
View File

@ -48,7 +48,7 @@ Meter_Indicator_Module::Meter_Indicator_Module ( bool is_default )
: Module ( is_default, 50, 100, name() ) : Module ( is_default, 50, 100, name() )
{ {
box( FL_FLAT_BOX ); box( FL_FLAT_BOX );
color( FL_GREEN ); color( FL_BACKGROUND_COLOR );
_pad = true; _pad = true;
control_value = 0; control_value = 0;
@ -56,6 +56,8 @@ Meter_Indicator_Module::Meter_Indicator_Module ( bool is_default )
add_port( Port( this, Port::INPUT, Port::CONTROL ) ); add_port( Port( this, Port::INPUT, Port::CONTROL ) );
dpm_pack = new Fl_Scalepack( x(), y(), w(), h() ); dpm_pack = new Fl_Scalepack( x(), y(), w(), h() );
dpm_pack->color( FL_BACKGROUND_COLOR );
dpm_pack->box( FL_FLAT_BOX );
dpm_pack->type( FL_HORIZONTAL ); dpm_pack->type( FL_HORIZONTAL );
end(); end();

8
mixer/src/Mixer.C
View File

@ -360,7 +360,7 @@ Mixer::Mixer ( int X, int Y, int W, int H, const char *L ) :
Loggable::dirty_callback( &Mixer::handle_dirty, this ); Loggable::dirty_callback( &Mixer::handle_dirty, this );
_rows = 1; _rows = 1;
box( FL_NO_BOX ); box( FL_FLAT_BOX );
labelsize( 96 ); labelsize( 96 );
{ Fl_Group *o = new Fl_Group( X, Y, W, 24 ); { Fl_Group *o = new Fl_Group( X, Y, W, 24 );
@ -411,14 +411,14 @@ Mixer::Mixer ( int X, int Y, int W, int H, const char *L ) :
o->end(); o->end();
} }
{ Fl_Scroll *o = scroll = new Fl_Scroll( X, Y + 24, W, H - 24 ); { Fl_Scroll *o = scroll = new Fl_Scroll( X, Y + 24, W, H - 24 );
o->box( FL_NO_BOX ); o->box( FL_FLAT_BOX );
// o->type( Fl_Scroll::HORIZONTAL_ALWAYS ); // o->type( Fl_Scroll::HORIZONTAL_ALWAYS );
// o->box( Fl_Scroll::BOTH ); // o->box( Fl_Scroll::BOTH );
{ {
Fl_Flowpack *o = mixer_strips = new Fl_Flowpack( X, Y + 24, W, H - 18 - 24 ); Fl_Flowpack *o = mixer_strips = new Fl_Flowpack( X, Y + 24, W, H - 18 - 24 );
label( "Non-Mixer" ); // label( "Non-Mixer" );
align( (Fl_Align)(FL_ALIGN_CENTER | FL_ALIGN_INSIDE) ); align( (Fl_Align)(FL_ALIGN_CENTER | FL_ALIGN_INSIDE) );
o->box( FL_NO_BOX ); o->box( FL_FLAT_BOX );
o->type( Fl_Pack::HORIZONTAL ); o->type( Fl_Pack::HORIZONTAL );
o->hspacing( 2 ); o->hspacing( 2 );
o->vspacing( 2 ); o->vspacing( 2 );

3
mixer/src/Mixer_Strip.C
View File

@ -359,8 +359,7 @@ Mixer_Strip::init ( )
_gain_controller_mode = 0; _gain_controller_mode = 0;
_chain = 0; _chain = 0;
// box(FL_THIN_UP_BOX); box( FL_BORDER_BOX );
box( FL_RFLAT_BOX );
labeltype( FL_NO_LABEL ); labeltype( FL_NO_LABEL );
Fl_Group::color( FL_BACKGROUND_COLOR ); Fl_Group::color( FL_BACKGROUND_COLOR );