Browse Source

Mixer: Tweak appearance.

tags/non-daw-v1.3.0
Jonathan Moore Liles 2 years ago
parent
commit
ae773fbf62
4 changed files with 12 additions and 7 deletions
  1. +1
    -1
      mixer/src/DPM.C
  2. +5
    -4
      mixer/src/Meter_Indicator_Module.C
  3. +4
    -1
      mixer/src/Mixer.C
  4. +2
    -1
      mixer/src/Mixer_Strip.C

+ 1
- 1
mixer/src/DPM.C View File

@@ -235,7 +235,7 @@ DPM::draw ( void )
else if ( p == pv )
c = div_color( p );
else
c = FL_DARK1; // fl_color_average( FL_BACKGROUND_COLOR, FL_BLACK, 0.50f );// FL_BACKGROUND_COLOR; //dim_div_color( p );
c = fl_darker( FL_BACKGROUND_COLOR );//FL_DARK1; // fl_color_average( FL_BACKGROUND_COLOR, FL_BLACK, 0.50f );// FL_BACKGROUND_COLOR; //dim_div_color( p );
if ( ! active )
c = fl_inactive( c );


+ 5
- 4
mixer/src/Meter_Indicator_Module.C View File

@@ -39,12 +39,14 @@
#include "FL/test_press.H"

const int DX = 1;

Meter_Indicator_Module::Meter_Indicator_Module ( bool is_default )
: Module ( is_default, 50, 100, name() )
{
box( FL_FLAT_BOX );
color( fl_darker( fl_darker( FL_BACKGROUND_COLOR )));
/* color( fl_darker( fl_darker( FL_BACKGROUND_COLOR ))); */
color( FL_BLACK );

_disable_context_menu = false;
_pad = true;
@@ -86,7 +88,7 @@ Meter_Indicator_Module::~Meter_Indicator_Module ( )
void Meter_Indicator_Module::resize ( int X, int Y, int W, int H )
{
Fl_Group::resize(X,Y,W,H);
dpm_pack->resize( x() + 2, y() + 2, w() - 4, h() - 4 );
dpm_pack->resize( x() + DX, y() + DX, w() - DX*2, h() - DX*2);
}

void
@@ -96,8 +98,7 @@ Meter_Indicator_Module::draw ( void )

Fl_Group::draw();
fl_rect( x(), y(), w(), h(), fl_darker(FL_BACKGROUND_COLOR));
fl_rect( x()+1, y()+1, w()-2, h()-2, fl_darker(fl_darker(FL_BACKGROUND_COLOR)));
fl_rect( x(), y(), w(), h(), fl_darker(fl_darker(FL_BACKGROUND_COLOR)));
}

void


+ 4
- 1
mixer/src/Mixer.C View File

@@ -571,6 +571,7 @@ Mixer::Mixer ( int X, int Y, int W, int H, const char *L ) :
align( (Fl_Align)(FL_ALIGN_CENTER | FL_ALIGN_INSIDE) );
o->flow( false );
o->box( FL_FLAT_BOX );
o->color( fl_darker(FL_BACKGROUND_COLOR ));
o->type( Fl_Pack::HORIZONTAL );
o->hspacing( 2 );
o->vspacing( 2 );
@@ -1106,7 +1107,9 @@ Mixer::handle ( int m )
{
if ( ! Fl::event_inside( this ) )
return 0;

DMESSAGE( "Got paste into mixer, expecting strip file..." );
const char *text = Fl::event_text();

char *file;


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

@@ -588,8 +588,9 @@ Mixer_Strip::init ( )
Fl_Sometimes_Input *o = new Fl_Sometimes_Input( 2, 2, 144, 15 );
name_field = o;

o->up_box( FL_NO_BOX );
o->up_box( FL_FLAT_BOX );
o->box( FL_FLAT_BOX );
o->color( FL_BACKGROUND_COLOR );
o->selection_color( FL_BLACK );
o->labeltype( FL_NO_LABEL );
o->labelcolor( FL_GRAY0 );


Loading…
Cancel
Save