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

Timeline: Use simpler boxtypes for audio regions.

This commit is contained in:
Jonathan Moore Liles 2012-05-01 03:03:48 -07:00
parent 0904809a05
commit 73d2c2d396
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
timeline/src/Audio_Region.C
View File

@ -50,7 +50,7 @@ extern Transport *transport;
bool Audio_Region::inherit_track_color = true; bool Audio_Region::inherit_track_color = true;
bool Audio_Region::show_box = true; bool Audio_Region::show_box = true;
Fl_Boxtype Audio_Region::_box = FL_UP_BOX; Fl_Boxtype Audio_Region::_box = FL_FLAT_BOX;
Fl_Color Audio_Region::_selection_color = FL_MAGENTA; Fl_Color Audio_Region::_selection_color = FL_MAGENTA;
@ -407,8 +407,6 @@ Audio_Region::draw_fade ( const Fade &fade, Fade::fade_dir_e dir, bool line, int
void void
Audio_Region::draw_box( void ) Audio_Region::draw_box( void )
{ {
/* dirty hack to keep the box from flipping to vertical at small sizes */
fl_push_clip( x(), y(), w(), h() ); fl_push_clip( x(), y(), w(), h() );
Fl_Color selection_color = _selection_color; Fl_Color selection_color = _selection_color;
@ -440,9 +438,9 @@ Audio_Region::draw_box( void )
} }
if ( selected() ) if ( selected() )
fl_draw_box( fl_down( b ), x() - ( h() >> 1 ), y(), w() + ( h() >> 1 ) + 50, h(), selection_color ); fl_draw_box( fl_down( b ), x(), y(), w(), h(), selection_color );
else else
fl_draw_box( b, x() - ( h() >> 1 ), y(), w() + ( h() >> 1 ) + 50, h(), c ); fl_draw_box( b, x(), y(), w(), h(), c );
/* used to draw fades here */ /* used to draw fades here */
/* draw fades */ /* draw fades */

3
timeline/src/Sequence.C
View File

@ -63,7 +63,8 @@ Sequence::init ( void )
_name = NULL; _name = NULL;
box( FL_DOWN_BOX ); // box( FL_DOWN_BOX );
box( FL_BORDER_BOX );
color( FL_BACKGROUND_COLOR ); color( FL_BACKGROUND_COLOR );
align( FL_ALIGN_LEFT ); align( FL_ALIGN_LEFT );