Browse Source

Mixer: Update for NTK transparency.

tags/non-daw-v1.2.0
Jonathan Moore Liles 13 years ago
parent
commit
870203b3dd
4 changed files with 9 additions and 8 deletions
  1. +1
    -1
      mixer/src/DPM.C
  2. +3
    -1
      mixer/src/Meter_Indicator_Module.C
  3. +4
    -4
      mixer/src/Mixer.C
  4. +1
    -2
      mixer/src/Mixer_Strip.C

+ 1
- 1
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 )
DPM::blend( FL_GREEN, FL_RED );

box( FL_ROUNDED_BOX );
box( FL_FLAT_BOX );
color( FL_BACKGROUND_COLOR );
}



+ 3
- 1
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() )
{
box( FL_FLAT_BOX );
color( FL_GREEN );
color( FL_BACKGROUND_COLOR );

_pad = true;
control_value = 0;
@@ -56,6 +56,8 @@ Meter_Indicator_Module::Meter_Indicator_Module ( bool is_default )
add_port( Port( this, Port::INPUT, Port::CONTROL ) );

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 );

end();


+ 4
- 4
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 );

_rows = 1;
box( FL_NO_BOX );
box( FL_FLAT_BOX );
labelsize( 96 );
{ 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();
}
{ 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->box( Fl_Scroll::BOTH );
{
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) );
o->box( FL_NO_BOX );
o->box( FL_FLAT_BOX );
o->type( Fl_Pack::HORIZONTAL );
o->hspacing( 2 );
o->vspacing( 2 );


+ 1
- 2
mixer/src/Mixer_Strip.C View File

@@ -359,8 +359,7 @@ Mixer_Strip::init ( )
_gain_controller_mode = 0;
_chain = 0;

// box(FL_THIN_UP_BOX);
box( FL_RFLAT_BOX );
box( FL_BORDER_BOX );
labeltype( FL_NO_LABEL );

Fl_Group::color( FL_BACKGROUND_COLOR );


Loading…
Cancel
Save