From fbb9ca3c4c9059ce3ec554e66d74fa3072bab446 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Sat, 1 Mar 2008 09:48:15 -0600
Subject: [PATCH] Clean up some drawing issues.

---
 Timeline.C | 19 ++++++++++++-------
 Track.C    |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Timeline.C b/Timeline.C
index 3596f6c..a7d8ab1 100644
--- a/Timeline.C
+++ b/Timeline.C
@@ -150,7 +150,7 @@ Timeline::Timeline ( int X, int Y, int W, int H, const char* L ) : Fl_Overlay_Wi
         {
             Fl_Pack *o = new Fl_Pack( X, rulers->y() + rulers->h(), W - vscroll->w(), 5000 );
             o->type( Fl_Pack::VERTICAL );
-            o->spacing( 5 );
+            o->spacing( 0 );
 
             Track *l = NULL;
             for ( int i = 16; i--;  )
@@ -236,10 +236,11 @@ Timeline::draw_measure_lines ( int X, int Y, int W, int H, Fl_Color color )
     if ( ! _enable_measure_lines )
         return;
 
-    fl_line_style( FL_DASH, 2 );
+//    fl_line_style( FL_DASH, 2 );
+    fl_line_style( FL_DASH, 0 );
 
-    Fl_Color beat = fl_color_average( FL_BLACK, color, 0.65f );
-    Fl_Color bar  = fl_color_average( FL_RED, color, 0.65f );
+     Fl_Color beat = fl_color_average( FL_BLACK, color, 0.65f );
+     Fl_Color bar  = fl_color_average( FL_RED, color, 0.65f );
 
     int measure;
 
@@ -328,7 +329,9 @@ Timeline::draw ( void )
     W = tracks->w() - Fl::box_dw( tracks->child( 0 )->box() ) - 1;
     H = tracks->h();
 
-    if ( damage() & FL_DAMAGE_ALL )
+    if ( (damage() & FL_DAMAGE_ALL)
+         ||
+         damage() & FL_DAMAGE_EXPOSE )
     {
         draw_box( box(), 0, 0, w(), h(), color() );
 
@@ -336,19 +339,21 @@ Timeline::draw ( void )
         draw_child( *rulers );
         fl_pop_clip();
 
-        fl_push_clip( tracks->x(), rulers->y() + rulers->h(), tracks->w(), h() - hscroll->h() );
+        fl_push_clip( tracks->x(), rulers->y() + rulers->h(), tracks->w(), hscroll->y() - (rulers->y() + rulers->h()) );
         draw_child( *tracks );
         fl_pop_clip();
 
         draw_child( *hscroll );
         draw_child( *vscroll );
 
-        redraw_overlay();
+//        redraw_overlay();
         return;
     }
 
     if ( damage() & FL_DAMAGE_CHILD )
     {
+//        draw_box( box(), 0, 0, w(), h(), color() );
+
         fl_push_clip( rulers->x(), rulers->y(), rulers->w() - vscroll->w(), rulers->h() );
         update_child( *rulers );
         fl_pop_clip();
diff --git a/Track.C b/Track.C
index ec0ad1c..1ed8532 100644
--- a/Track.C
+++ b/Track.C
@@ -51,7 +51,7 @@ Track::draw ( void )
     if ( ! fl_not_clipped( x(), y(), w(), h() ) )
         return;
 
-/*     fl_push_clip( x(), y(), w(), h() ); */
+    fl_push_clip( x(), y(), w(), h() );
 
     Fl_Group::draw();
 
@@ -70,7 +70,7 @@ Track::draw ( void )
     for ( list <Track_Widget *>::const_iterator r = _widgets.begin();  r != _widgets.end(); r++ )
         (*r)->draw( X, Y, W, H );
 
-/*     fl_pop_clip(); */
+    fl_pop_clip();
 }
 
 void