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

Mixer: Clean up some issues with display of JACK connection lists.

This commit is contained in:
Jonathan Moore Liles 2013-05-02 17:07:35 -07:00
parent 899740c2f1
commit 973089890c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mixer/src/AUX_Module.C
View File

@ -47,6 +47,8 @@ AUX_Module::AUX_Module ( ) : JACK_Module ( false )
log_create(); log_create();
color( FL_DARK1 );
copy_label( "Aux" ); copy_label( "Aux" );
} }
@ -123,7 +125,7 @@ AUX_Module::draw ( void )
{ {
int W = 5; 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_box(x(),y(),w() - W,h());
Module::draw_label(x(),y(),w() - W,h()); Module::draw_label(x(),y(),w() - W,h());

7
mixer/src/JACK_Module.C
View File

@ -146,11 +146,13 @@ JACK_Module::JACK_Module ( bool log )
{ {
Fl_Browser *o = connection_display = new Fl_Browser( 0, 0, w(), h() ); Fl_Browser *o = connection_display = new Fl_Browser( 0, 0, w(), h() );
o->has_scrollbar(Fl_Browser_::VERTICAL);
o->textsize( 11 ); o->textsize( 11 );
o->textcolor( FL_LIGHT3 ); o->textcolor( FL_LIGHT3 );
o->textfont( FL_COURIER ); o->textfont( FL_COURIER );
o->box( FL_FLAT_BOX ); 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); Fl_Group::current()->resizable(o);
} }
@ -292,7 +294,10 @@ JACK_Module::update_connection_status ( void )
if ( n > 15 ) if ( n > 15 )
n = 15; n = 15;
if ( n > 0 )
size( w(), 26 + ( n * ( connection_display->incr_height() ) ) ); size( w(), 26 + ( n * ( connection_display->incr_height() ) ) );
else
size( w(), 24 );
parent()->parent()->redraw(); parent()->parent()->redraw();
} }