From 973089890cd0c0daad26ed9db05a9d2da8a7ab9c Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Thu, 2 May 2013 17:07:35 -0700 Subject: [PATCH] Mixer: Clean up some issues with display of JACK connection lists. --- mixer/src/AUX_Module.C | 4 +++- mixer/src/JACK_Module.C | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mixer/src/AUX_Module.C b/mixer/src/AUX_Module.C index af8415a..33ee619 100644 --- a/mixer/src/AUX_Module.C +++ b/mixer/src/AUX_Module.C @@ -47,6 +47,8 @@ AUX_Module::AUX_Module ( ) : JACK_Module ( false ) log_create(); + color( FL_DARK1 ); + copy_label( "Aux" ); } @@ -123,7 +125,7 @@ AUX_Module::draw ( void ) { int W = 5; - child(0)->size( w() - W, 18 ); + child(0)->size( w() - W, h() ); Module::draw_box(x(),y(),w() - W,h()); Module::draw_label(x(),y(),w() - W,h()); diff --git a/mixer/src/JACK_Module.C b/mixer/src/JACK_Module.C index b9e5b24..f70fd23 100644 --- a/mixer/src/JACK_Module.C +++ b/mixer/src/JACK_Module.C @@ -146,11 +146,13 @@ JACK_Module::JACK_Module ( bool log ) { Fl_Browser *o = connection_display = new Fl_Browser( 0, 0, w(), h() ); + o->has_scrollbar(Fl_Browser_::VERTICAL); o->textsize( 11 ); o->textcolor( FL_LIGHT3 ); o->textfont( FL_COURIER ); o->box( FL_FLAT_BOX ); - o->color( fl_color_add_alpha( fl_rgb_color( 10, 10, 10 ), 25 )); + o->color( FL_DARK1 ); + // o->color( fl_color_add_alpha( fl_rgb_color( 10, 10, 10 ), 100 )); Fl_Group::current()->resizable(o); } @@ -292,8 +294,11 @@ JACK_Module::update_connection_status ( void ) if ( n > 15 ) n = 15; - size( w(), 26 + ( n * ( connection_display->incr_height() ) ) ); - + if ( n > 0 ) + size( w(), 26 + ( n * ( connection_display->incr_height() ) ) ); + else + size( w(), 24 ); + parent()->parent()->redraw(); }