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

Timeline: Simplify drawing of crossfades by using NTK transparency.

This commit is contained in:
Jonathan Moore Liles 2012-06-13 23:04:42 -07:00
parent 7107cbbf4c
commit ab8f23f15d
1 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
timeline/src/Audio_Sequence.C
View File

@ -155,6 +155,8 @@ Audio_Sequence::draw ( void )
int xfades = 0; int xfades = 0;
fl_push_clip( x(), y(), w(), h() );
/* draw crossfades */ /* draw crossfades */
for ( list <Sequence_Widget *>::const_iterator r = _widgets.begin(); r != _widgets.end(); r++ ) for ( list <Sequence_Widget *>::const_iterator r = _widgets.begin(); r != _widgets.end(); r++ )
{ {
@ -178,57 +180,16 @@ Audio_Sequence::draw ( void )
(o->x() + o->w()) - (*r)->x(), (o->x() + o->w()) - (*r)->x(),
o->h() ); o->h() );
/* Fl_Color c = fl_color_average( o->color(), (*r)->color(), 0.50f ); */ Fl_Color c = fl_color_add_alpha( FL_YELLOW, 127 );
/* c = fl_color_average( c, FL_YELLOW, 0.30f ); */
/* Fl_Color c = fl_color_add_alpha( FL_YELLOW, 50 ); */
Fl_Color c = FL_YELLOW;
/* fl_push_use_cairo( true ); */ fl_color( c );
fl_rectf( b.x, b.y, b.w, b.h );
fl_push_clip( b.x, b.y, b.w, b.h );
Fl_Widget::draw_box( FL_FLAT_BOX, b.x - 100, b.y, b.w + 200, b.h, c );
Fl_Widget::draw_box( FL_UP_FRAME, b.x - 100, b.y, b.w + 200, b.h, c );
fl_pop_clip();
/* fl_pop_use_cairo(); */
} }
} }
} }
for ( list <Sequence_Widget *>::const_iterator r = _widgets.begin(); r != _widgets.end(); r++ ) fl_pop_clip();
{
Sequence_Widget *o = overlaps( *r );
if ( o )
{
if ( *o <= **r )
{
if ( o->contains( *r ) )
/* completely inside */
continue;
Rectangle b( (*r)->x(), o->y(), (o->x() + o->w()) - (*r)->x(), o->h() );
/* draw overlapping waveforms in X-ray style. */
/* bool t = Waveform::fill; */
/* Waveform::fill = false; */
fl_push_clip( b.x, b.y, b.w, b.h );
o->draw();
(*r)->draw();
fl_pop_clip();
/* Waveform::fill = t; */
}
}
}
} }
/** event handler that supports DND of audio clips */ /** event handler that supports DND of audio clips */