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

Improve the appearance of rec/mute/solo buttons.

This commit is contained in:
Jonathan Moore Liles 2008-07-25 23:39:26 -05:00
parent 32f47edaa1
commit cdbf01183c
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FL/Boxtypes.C
View File

@ -271,8 +271,11 @@ shade_round ( int x, int y, int w, int h, const char *c, Fl_Color bc )
fl_pie( x, y, h, h, 225.0 + i * na, 270.0 ); fl_pie( x, y, h, h, 225.0 + i * na, 270.0 );
fl_color( shade_color( g[c[clen - i] - 2], bc ) ); fl_color( shade_color( g[c[clen - i] - 2], bc ) );
fl_pie( x, y, h, h, 135.0 + i * na, 225.0 + i * na ); fl_pie( x, y, h, h, 135.0 + i * na, 225.0 + i * na );
} }
fl_color( shade_color( g[c[chalf]], bc ) ); // fl_color( shade_color( g[c[chalf]], bc ) );
fl_color( bc );
fl_rectf( x + d, y, w - h + 1, h + 1 ); fl_rectf( x + d, y, w - h + 1, h + 1 );
fl_pie( x, y, h, h, 90.0, 270.0 ); fl_pie( x, y, h, h, 90.0, 270.0 );
fl_pie( x + w - h, y, h, h, 270.0, 90.0 ); fl_pie( x + w - h, y, h, h, 270.0, 90.0 );
@ -296,7 +299,8 @@ shade_round ( int x, int y, int w, int h, const char *c, Fl_Color bc )
fl_yxline( x, y + d, y + h - d ); fl_yxline( x, y + d, y + h - d );
fl_pie( x, y, w, w, 135.0 + i * na, 180.0 ); fl_pie( x, y, w, w, 135.0 + i * na, 180.0 );
} }
fl_color( shade_color( g[c[chalf]], bc ) ); // fl_color( shade_color( g[c[chalf]], bc ) );
fl_color( bc );
fl_rectf( x, y + d, w + 1, h - w + 1 ); fl_rectf( x, y + d, w + 1, h - w + 1 );
fl_pie( x, y, w, w, 0.0, 180.0 ); fl_pie( x, y, w, w, 0.0, 180.0 );
fl_pie( x, y + h - w, w, w, 180.0, 360.0 ); fl_pie( x, y + h - w, w, w, 180.0, 360.0 );
@ -426,8 +430,7 @@ init_boxtypes ( void )
Fl::set_boxtype( FL_PLASTIC_DOWN_FRAME, down_frame, 2,2,4,4 ); Fl::set_boxtype( FL_PLASTIC_DOWN_FRAME, down_frame, 2,2,4,4 );
Fl::set_boxtype( FL_PLASTIC_THIN_UP_BOX, thin_up_box, 1,1,2,2 ); Fl::set_boxtype( FL_PLASTIC_THIN_UP_BOX, thin_up_box, 1,1,2,2 );
Fl::set_boxtype( FL_PLASTIC_THIN_DOWN_BOX, down_box, 1,1,2,2 ); Fl::set_boxtype( FL_PLASTIC_THIN_DOWN_BOX, down_box, 1,1,2,2 );
Fl::set_boxtype( FL_CRYSTAL_ROUND_UP_BOX, up_round, 1,1,2,2 );
/* Fl::set_boxtype( FL_CRYSTAL_ROUND_UP_BOX, up_round ); */ Fl::set_boxtype( FL_CRYSTAL_ROUND_DOWN_BOX, down_round, 1,1,2,2 );
/* Fl::set_boxtype( FL_CRYSTAL_ROUND_DOWN_BOX, down_round ); */
} }

14
FL/Boxtypes.H
View File

@ -21,11 +21,13 @@
#define FL_BURNISHED_OVAL_BOX FL_FREE_BOXTYPE #define FL_BURNISHED_OVAL_BOX FL_FREE_BOXTYPE
#define FL_CRYSTAL_UP_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+1) #define FL_CRYSTAL_UP_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+1)
#define FL_CRYSTAL_DOWN_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+2) #define FL_CRYSTAL_DOWN_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+2)
#define FL_CRYSTAL_UP_FRAME (Fl_Boxtype)(FL_FREE_BOXTYPE+3) #define FL_CRYSTAL_UP_FRAME (Fl_Boxtype)(FL_FREE_BOXTYPE+3)
#define FL_CRYSTAL_DOWN_FRAME (Fl_Boxtype)(FL_FREE_BOXTYPE+4) #define FL_CRYSTAL_DOWN_FRAME (Fl_Boxtype)(FL_FREE_BOXTYPE+4)
#define FL_CRYSTAL_THIN_UP_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+5) #define FL_CRYSTAL_THIN_UP_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+5)
#define FL_CRYSTAL_THIN_DOWN_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+6) #define FL_CRYSTAL_THIN_DOWN_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+6)
#define FL_CRYSTAL_ROUND_UP_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+7)
#define FL_CRYSTAL_ROUND_DOWN_BOX (Fl_Boxtype)(FL_FREE_BOXTYPE+8)
void init_boxtypes ( void ); void init_boxtypes ( void );

18
Timeline/Track.C
View File

@ -94,6 +94,7 @@ Track::~Track ( )
Loggable::block_end(); Loggable::block_end();
} }
#include "FL/Boxtypes.H"
void void
Track::init ( void ) Track::init ( void )
@ -136,20 +137,22 @@ Track::init ( void )
Fl_Button *o = record_button = Fl_Button *o = record_button =
new Fl_Button( 6, 28, 26, 24, "@circle" ); new Fl_Button( 6, 28, 26, 24, "@circle" );
o->type( 1 ); o->type( 1 );
o->box( FL_THIN_UP_BOX ); o->box( FL_ROUNDED_BOX );
o->down_box( FL_ROUNDED_BOX );
o->color( FL_LIGHT1 ); o->color( FL_LIGHT1 );
o->selection_color( FL_RED ); o->selection_color( FL_RED );
o->labelsize( 8 ); o->labelsize( 9 );
o->callback( cb_button, this ); o->callback( cb_button, this );
} }
{ {
Fl_Button *o = mute_button = Fl_Button *o = mute_button =
new Fl_Button( 35, 28, 26, 24, "m" ); new Fl_Button( 35, 28, 26, 24, "m" );
o->selection_color( fl_color_average( FL_YELLOW, FL_RED, 0.50 ) ); o->selection_color( fl_color_average( FL_YELLOW, FL_GREEN, 0.50 ) );
o->type( 1 ); o->type( 1 );
o->box( FL_THIN_UP_BOX ); o->box( FL_ROUNDED_BOX );
o->down_box( FL_ROUNDED_BOX );
o->color( FL_LIGHT1 ); o->color( FL_LIGHT1 );
o->labelsize( 11 ); o->labelsize( 15 );
o->callback( cb_button, this ); o->callback( cb_button, this );
} }
{ {
@ -157,9 +160,10 @@ Track::init ( void )
new Fl_Button( 66, 28, 26, 24, "s" ); new Fl_Button( 66, 28, 26, 24, "s" );
o->selection_color( fl_color_average( FL_YELLOW, FL_RED, 0.50 ) ); o->selection_color( fl_color_average( FL_YELLOW, FL_RED, 0.50 ) );
o->type( 1 ); o->type( 1 );
o->box( FL_THIN_UP_BOX ); o->box( FL_ROUNDED_BOX );
o->down_box( FL_ROUNDED_BOX );
o->color( FL_LIGHT1 ); o->color( FL_LIGHT1 );
o->labelsize( 11 ); o->labelsize( 15 );
o->callback( cb_button, this ); o->callback( cb_button, this );
} }
{ {