From 1fc7c2eed241d33c27d75bfd4ff3b6df5e0bbce1 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Wed, 1 May 2013 18:01:53 -0700 Subject: [PATCH] Timeline: Tweak crossfade appearance. --- timeline/src/Audio_Region.C | 8 ++++---- timeline/src/Audio_Sequence.C | 11 ++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/timeline/src/Audio_Region.C b/timeline/src/Audio_Region.C index 7cef71d..051f241 100644 --- a/timeline/src/Audio_Region.C +++ b/timeline/src/Audio_Region.C @@ -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 ); diff --git a/timeline/src/Audio_Sequence.C b/timeline/src/Audio_Sequence.C index 6fe702d..aa8eb26 100644 --- a/timeline/src/Audio_Sequence.C +++ b/timeline/src/Audio_Sequence.C @@ -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 ); } }