From e6e101fc6795060d6ef5da858269f9ff4d14472d Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Fri, 26 Apr 2013 21:25:00 -0700 Subject: [PATCH] Tweak colors. --- mixer/src/DPM.C | 4 ++-- mixer/src/JACK_Module.C | 3 ++- mixer/src/Mixer_Strip.C | 17 +++++++++++------ mixer/src/Mixer_Strip.H | 2 ++ timeline/src/Timeline.C | 2 +- timeline/src/Track_Header.fl | 33 ++++++++++++++++++--------------- 6 files changed, 36 insertions(+), 25 deletions(-) diff --git a/mixer/src/DPM.C b/mixer/src/DPM.C index 8cb551a..e217d34 100644 --- a/mixer/src/DPM.C +++ b/mixer/src/DPM.C @@ -136,7 +136,7 @@ DPM::draw ( void ) { draw_label(); - draw_box( FL_FLAT_BOX, x(), y(), w(), h(), FL_BLACK ); + draw_box( FL_FLAT_BOX, x(), y(), w(), h(), FL_DARK1 ); } fl_push_clip( X, Y, W, H ); @@ -197,7 +197,7 @@ DPM::draw ( void ) if ( _pixels_per_segment > 3 ) { - fl_color( FL_BLACK ); + fl_color( FL_DARK1 ); if ( type() == FL_HORIZONTAL ) { diff --git a/mixer/src/JACK_Module.C b/mixer/src/JACK_Module.C index 2a485f2..bcdf7ce 100644 --- a/mixer/src/JACK_Module.C +++ b/mixer/src/JACK_Module.C @@ -86,7 +86,8 @@ JACK_Module::JACK_Module ( bool log ) add_port( p ); } - color( FL_BLACK ); + + color( FL_DARK1 ); log_create(); } diff --git a/mixer/src/Mixer_Strip.C b/mixer/src/Mixer_Strip.C index b9261bb..d083416 100644 --- a/mixer/src/Mixer_Strip.C +++ b/mixer/src/Mixer_Strip.C @@ -171,8 +171,8 @@ void Mixer_Strip::color ( Fl_Color c ) { _color = c; - name_field->color( _color ); - name_field->redraw(); + color_box->color( _color ); + color_box->redraw(); } Fl_Color @@ -384,20 +384,25 @@ Mixer_Strip::init ( ) { Fl_Scalepack *o = new Fl_Scalepack( 2, 2, 116, 595 ); o->type( FL_VERTICAL ); o->spacing( 2 ); + + { Fl_Box *o = color_box = new Fl_Box( 0,0, 25, 10 ); + o->box(FL_FLAT_BOX); + } { Fl_Pack *o = new Fl_Pack( 2, 2, 114, 100 ); o->type( Fl_Pack::VERTICAL ); o->spacing( 2 ); { - Fl_Sometimes_Input *o = new Fl_Sometimes_Input( 2, 2, 144, 24 ); + Fl_Sometimes_Input *o = new Fl_Sometimes_Input( 2, 2, 144, 15 ); name_field = o; - o->color( color() ); - o->up_box( FL_DOWN_BOX ); - o->box( FL_DOWN_BOX ); + o->up_box( FL_NO_BOX ); + o->box( FL_FLAT_BOX ); + o->selection_color( FL_BLACK ); o->labeltype( FL_NO_LABEL ); o->labelcolor( FL_GRAY0 ); o->textcolor( FL_FOREGROUND_COLOR ); + o->textsize( 12 ); o->value( name() ); o->callback( cb_handle, (void*)this ); } diff --git a/mixer/src/Mixer_Strip.H b/mixer/src/Mixer_Strip.H index 5b65723..ed96578 100644 --- a/mixer/src/Mixer_Strip.H +++ b/mixer/src/Mixer_Strip.H @@ -109,6 +109,8 @@ private: Controller_Module *spatialization_controller; Meter_Indicator_Module *meter_indicator; + Fl_Box *color_box; + nframes_t nframes; Fl_Color _color; diff --git a/timeline/src/Timeline.C b/timeline/src/Timeline.C index 6cdc0b9..f5c1caa 100644 --- a/timeline/src/Timeline.C +++ b/timeline/src/Timeline.C @@ -165,7 +165,7 @@ protected: if ( !s ) continue; - fl_color( FL_BLACK ); + fl_color( FL_DARK1 ); const double scale = (double)H / ( pack_visible_height( timeline->tracks ) ); diff --git a/timeline/src/Track_Header.fl b/timeline/src/Track_Header.fl index da402ad..f3821a0 100644 --- a/timeline/src/Track_Header.fl +++ b/timeline/src/Track_Header.fl @@ -24,19 +24,19 @@ decl {Fl_PNG_Image *input_connector_image = NULL;} {private local } widget_class Track_Header {open - xywh {680 695 525 60} type Double box NO_BOX resizable visible + xywh {920 525 525 60} type Double box NO_BOX resizable visible } { Fl_Group box_group {open - private xywh {0 0 200 60} box THIN_UP_BOX color 63 + private xywh {0 -1 200 67} box THIN_UP_BOX color 48 code0 {o->resizable(0);} } { Fl_Group {} {open - xywh {0 0 200 55} + xywh {0 -1 200 62} code0 {o->resizable(0);} } { Fl_Input name_input { label {input:} - xywh {4 2 151 22} labeltype NO_LABEL align 20 when 8 + xywh {15 2 140 22} labeltype NO_LABEL align 20 when 8 class Fl_Sometimes_Input } Fl_Button track_inputs_indicator { @@ -49,15 +49,15 @@ widget_class Track_Header {open } Fl_Button menu_button { label menu - tooltip {Expand controls} xywh {4 26 31 24} selection_color 3 labelfont 4 labelsize 10 + tooltip {Expand controls} xywh {15 26 31 24} selection_color 3 labelfont 4 labelsize 10 } Fl_Button overlay_controls_button { label {c-} - tooltip {Expand controls} xywh {39 26 24 24} type Toggle selection_color 3 labelfont 5 labelsize 12 + tooltip {Expand controls} xywh {50 26 24 24} type Toggle selection_color 3 labelfont 5 labelsize 12 } Fl_Button show_all_takes_button { label {t+} - tooltip {Show all takes} xywh {66 26 24 24} type Toggle selection_color 3 labelfont 5 labelsize 12 + tooltip {Show all takes} xywh {77 26 24 24} type Toggle selection_color 3 labelfont 5 labelsize 12 } Fl_Button rec_button { label r @@ -76,7 +76,7 @@ widget_class Track_Header {open code0 {o->image( input_connector_image ? input_connector_image : input_connector_image = new Fl_PNG_Image( "input-connector", img_io_input_connector_10x10_png, img_io_input_connector_10x10_png_len ) );} code1 {o->box(FL_NO_BOX);} } - Fl_Box output_connector_handle {selected + Fl_Box output_connector_handle { tooltip {Drag and drop this output connector to make or break JACK connections} xywh {177 4 18 18} box FLAT_BOX code0 {o->image( output_connector_image ? output_connector_image : output_connector_image = new Fl_PNG_Image( "output-connector", img_io_output_connector_10x10_png, img_io_output_connector_10x10_png_len ) );} code1 {o->box(FL_NO_BOX);} @@ -88,29 +88,32 @@ widget_class Track_Header {open xywh {200 0 325 60} resizable code0 {o->labeltype(FL_NO_LABEL);} } + Fl_Box color_box {selected + xywh {0 0 10 60} box FLAT_BOX color 59 + } Function {draw()} {open return_type {virtual void} } { - code {box_group->color( color() ); + code {color_box->color( color() ); Fl_Group::draw();} {} } } widget_class Control_Sequence_Header {open - xywh {325 886 200 55} type Double box NO_BOX visible + xywh {333 978 200 55} type Double box NO_BOX visible } { Fl_Input name_input { label {input:} - xywh {5 3 192 22} labeltype NO_LABEL align 20 when 8 textsize 12 + xywh {15 3 182 22} labeltype NO_LABEL align 20 when 8 textsize 12 class Fl_Sometimes_Input } Fl_Button menu_button { label menu - tooltip {Expand controls} xywh {5 26 31 24} selection_color 3 labelfont 4 labelsize 10 + tooltip {Expand controls} xywh {15 26 31 24} selection_color 3 labelfont 4 labelsize 10 } Fl_Button outputs_indicator { label out - tooltip {lit if outputs are connected} xywh {40 26 24 16} box BORDER_BOX down_box BORDER_BOX color 48 selection_color 90 labelfont 5 labelsize 10 + tooltip {lit if outputs are connected} xywh {50 26 24 16} box BORDER_BOX down_box BORDER_BOX color 48 selection_color 90 labelfont 5 labelsize 10 code0 {o->ignore_input( true );} code1 {o->blink( false );} class Fl_Blink_Button @@ -128,7 +131,7 @@ widget_class Control_Sequence_Header {open } widget_class Audio_Sequence_Header {open - xywh {404 670 200 50} type Double box NO_BOX resizable visible + xywh {418 762 200 50} type Double box NO_BOX resizable visible } { Fl_Group {} {open xywh {0 0 200 55} @@ -136,7 +139,7 @@ widget_class Audio_Sequence_Header {open } { Fl_Input name_input { label {input:} - xywh {0 3 193 22} labeltype NO_LABEL align 20 when 8 textsize 12 + xywh {15 3 178 22} labeltype NO_LABEL align 20 when 8 textsize 12 class Fl_Sometimes_Input } Fl_Button delete_button {