From 7217266f6bd32e3bcaa9e70b0f9310e42023f913 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Mon, 4 Jun 2012 17:25:54 -0700 Subject: [PATCH] Timeline: Tweak measure line drawing. --- timeline/src/Sequence.C | 5 ++--- timeline/src/Track.C | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/timeline/src/Sequence.C b/timeline/src/Sequence.C index d50190e..02a28ff 100644 --- a/timeline/src/Sequence.C +++ b/timeline/src/Sequence.C @@ -63,8 +63,7 @@ Sequence::init ( void ) _name = NULL; -// box( FL_DOWN_BOX ); - box( FL_BORDER_BOX ); + box( FL_FLAT_BOX ); color( FL_BACKGROUND_COLOR ); align( FL_ALIGN_LEFT ); @@ -281,7 +280,7 @@ Sequence::draw ( void ) // printf( "track::draw %d,%d %dx%d\n", X,Y,W,H ); -// timeline->draw_measure_lines( X, Y, W, H, color() ); + timeline->draw_measure_lines( X, Y, W, H ); for ( list ::const_iterator r = _widgets.begin(); r != _widgets.end(); ++r ) (*r)->draw_box(); diff --git a/timeline/src/Track.C b/timeline/src/Track.C index a02049e..8f7aa26 100644 --- a/timeline/src/Track.C +++ b/timeline/src/Track.C @@ -125,7 +125,7 @@ Track::init ( void ) Fl_Group::size( timeline->w(), height() ); Track *o = this; - o->box( FL_NO_BOX ); + o->box( FL_FLAT_BOX ); { Fl_Group *o = new Fl_Group( 0, 0, 149, 70 ); @@ -839,6 +839,8 @@ Track::draw ( void ) fl_clip_box( x(), y(), w(), h(), X, Y, W, H ); + timeline->draw_measure_lines( X, Y, W, H ); + if ( _selected ) { Fl_Color c = color(); @@ -852,7 +854,6 @@ Track::draw ( void ) else Fl_Group::draw(); - timeline->draw_measure_lines( X, Y, W, H ); fl_pop_clip(); } @@ -883,7 +884,7 @@ Track::handle ( int m ) Logger log( this ); if ( ! Fl::event_shift() ) - return 0; + return Fl_Group::handle( m ); int d = Fl::event_dy();