From 28d1b4754b14acfdf8691c1b43e2b7e6546ef7a2 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Sun, 27 Apr 2008 05:33:26 -0500 Subject: [PATCH] Minor costmetic cleanup. --- Timeline/Ruler_Sequence.H | 2 +- Timeline/Sequence.C | 3 +-- Timeline/Tempo_Sequence.H | 2 +- Timeline/Time_Sequence.H | 2 +- Timeline/Timeline.C | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Timeline/Ruler_Sequence.H b/Timeline/Ruler_Sequence.H index 5119210..d0521a4 100644 --- a/Timeline/Ruler_Sequence.H +++ b/Timeline/Ruler_Sequence.H @@ -30,7 +30,7 @@ public: Ruler_Sequence ( int X, int Y, int W, int H ) : Sequence ( X, Y, W, H ) { - box( FL_UP_BOX ); +// box( FL_UP_BOX ); } void diff --git a/Timeline/Sequence.C b/Timeline/Sequence.C index ab9681a..1310f2f 100644 --- a/Timeline/Sequence.C +++ b/Timeline/Sequence.C @@ -38,8 +38,7 @@ Sequence::Sequence ( int X, int Y, int W, int H, Track *track ) : Fl_Widget( X, /* if ( track ) */ /* track->add( this ); */ -// box( FL_DOWN_BOX ); - box( FL_CRYSTAL_DOWN_BOX ); + box( FL_DOWN_BOX ); color( fl_darker( FL_GRAY ) ); align( FL_ALIGN_LEFT ); diff --git a/Timeline/Tempo_Sequence.H b/Timeline/Tempo_Sequence.H index 4b1365a..1bb909c 100644 --- a/Timeline/Tempo_Sequence.H +++ b/Timeline/Tempo_Sequence.H @@ -31,7 +31,7 @@ public: Tempo_Sequence ( int X, int Y, int W, int H ) : Sequence ( X, Y, W, H ) { - box( FL_UP_BOX ); +// box( FL_DOWN_BOX ); } float diff --git a/Timeline/Time_Sequence.H b/Timeline/Time_Sequence.H index 51572db..57409d1 100644 --- a/Timeline/Time_Sequence.H +++ b/Timeline/Time_Sequence.H @@ -32,7 +32,7 @@ public: Time_Sequence ( int X, int Y, int W, int H ) : Sequence ( X, Y, W, H ) { - box( FL_UP_BOX ); +// box( FL_UP_BOX ); } time_sig diff --git a/Timeline/Timeline.C b/Timeline/Timeline.C index 0c31c21..ac1583f 100644 --- a/Timeline/Timeline.C +++ b/Timeline/Timeline.C @@ -117,7 +117,7 @@ Timeline::Timeline ( int X, int Y, int W, int H, const char* L ) : Fl_Overlay_Wi { Tempo_Sequence *o = new Tempo_Sequence( 0, 0, 800, 24 ); - o->color( FL_RED ); + o->color( fl_gray_ramp( 18 ) ); o->label( "Tempo" ); o->align( FL_ALIGN_LEFT ); @@ -128,7 +128,7 @@ Timeline::Timeline ( int X, int Y, int W, int H, const char* L ) : Fl_Overlay_Wi { Time_Sequence *o = new Time_Sequence( 0, 24, 800, 24 ); - o->color( fl_color_average( FL_RED, FL_WHITE, 0.50f ) ); + o->color( fl_gray_ramp( 16 ) ); o->label( "Time" ); o->align( FL_ALIGN_LEFT ); @@ -139,7 +139,7 @@ Timeline::Timeline ( int X, int Y, int W, int H, const char* L ) : Fl_Overlay_Wi { Ruler_Sequence *o = new Ruler_Sequence( 0, 24, 800, 24 ); - o->color( FL_GREEN ); + o->color( fl_gray_ramp( 'F' ) ); o->label( "Ruler" ); o->align( FL_ALIGN_LEFT );