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

Timeline: Tweak crossfade appearance.

pull/116/head
Jonathan Moore Liles 2013-05-01 18:01:53 -07:00
parent 97677c561e
commit 1fc7c2eed2
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
timeline/src/Audio_Region.C
View File

@ -539,11 +539,11 @@ Audio_Region::draw ( void )
nframes_t total_frames_needed = timeline->x_to_ts( total_peaks_needed );
{
Fl_Color c = fl_color_average( FL_DARK1,
Audio_Region::inherit_track_color ? sequence()->track()->color() : _box_color,
0.75f );
/* Fl_Color c = fl_color_average( FL_DARK1, */
/* Audio_Region::inherit_track_color ? sequence()->track()->color() : _box_color, */
/* 0.75f ); */
fl_color( fl_color_add_alpha( c, 127 ) );
fl_color( fl_color_add_alpha( FL_DARK1, 127 ) );
draw_fade( _fade_in, Fade::In, false, X, W );
draw_fade( _fade_out, Fade::Out, false, X, W );

11
timeline/src/Audio_Sequence.C
View File

@ -233,10 +233,15 @@ Audio_Sequence::draw ( void )
(o->x() + o->w()) - (*r)->x(),
o->h() );
Fl_Color c = fl_color_add_alpha( FL_YELLOW, 127 );
cairo_t *cc = Fl::cairo_cc();
cairo_set_operator( cc, CAIRO_OPERATOR_HSL_COLOR );
cairo_set_source_rgba( cc, 1, 1, 0, 0.80 );
cairo_rectangle( cc, b.x, b.y, b.w, b.h );
cairo_fill( cc );
fl_color( c );
fl_rectf( b.x, b.y, b.w, b.h );
cairo_set_operator( cc, CAIRO_OPERATOR_OVER );
}
}