From f9d93f4307e5fd095919db78e37b038e361a811b Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Mon, 5 May 2008 21:56:26 -0500 Subject: [PATCH] Small hack to fix one-pixel size difference when there are no annotation tracks. --- Timeline/Timeline.C | 3 --- Timeline/Track.C | 12 +++++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Timeline/Timeline.C b/Timeline/Timeline.C index b99480d..47ea5eb 100644 --- a/Timeline/Timeline.C +++ b/Timeline/Timeline.C @@ -487,9 +487,6 @@ Timeline::resize ( int X, int Y, int W, int H ) void Timeline::draw ( void ) { - if ( ! visible_r() ) - return; - int X, Y, W, H; int bdx = 0; diff --git a/Timeline/Track.C b/Timeline/Track.C index d32f6f7..c75acad 100644 --- a/Timeline/Track.C +++ b/Timeline/Track.C @@ -207,17 +207,17 @@ Track::init ( void ) resizable( o ); { - Fl_Pack *o = annotation = new Fl_Pack( width(), 0, pack->w(), 115 ); + Fl_Pack *o = annotation = new Fl_Pack( width(), 0, pack->w(), 0 ); o->end(); } { - Fl_Pack *o = control = new Fl_Pack( width(), 0, pack->w(), 115 ); + Fl_Pack *o = control = new Fl_Pack( width(), 0, pack->w(), 0 ); o->end(); } { - Fl_Pack *o = takes = new Fl_Pack( width(), 0, pack->w(), 115 ); + Fl_Pack *o = takes = new Fl_Pack( width(), 0, pack->w(), 0 ); o->end(); o->hide(); } @@ -279,6 +279,12 @@ Track::resize ( void ) for ( int i = control->children(); i--; ) control->child( i )->size( w(), height() ); + /* FIXME: hack! */ + if ( annotation->children() ) + annotation->show(); + else + annotation->hide(); + if ( _show_all_takes ) { takes->show();