From 0acc95509e72b446be68d8b3f1524aa8d7e0737c Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Thu, 29 May 2008 16:54:10 -0500 Subject: [PATCH] Clean up display of annotation regions. --- Timeline/Sequence_Region.C | 2 +- Timeline/Sequence_Widget.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Timeline/Sequence_Region.C b/Timeline/Sequence_Region.C index c9efb59..dc41353 100644 --- a/Timeline/Sequence_Region.C +++ b/Timeline/Sequence_Region.C @@ -53,7 +53,7 @@ Sequence_Region::set ( Log_Entry &e ) void Sequence_Region::draw_box ( void ) { - fl_draw_box( box(), x(), y(), w(), h(), box_color() ); + fl_draw_box( box(), line_x(), y(), abs_w(), h(), box_color() ); } void diff --git a/Timeline/Sequence_Widget.C b/Timeline/Sequence_Widget.C index a3d8a0f..6d78fe8 100644 --- a/Timeline/Sequence_Widget.C +++ b/Timeline/Sequence_Widget.C @@ -258,7 +258,7 @@ Sequence_Widget::draw_label ( const char *label, Fl_Align align, Fl_Color color if ( align & FL_ALIGN_BOTTOM ) fl_draw_box( b, X - dx - bx, Y + H - lh, lw + bw, lh, FL_GRAY ); - else if ( align == FL_ALIGN_LEFT ) + else if ( align & FL_ALIGN_LEFT ) fl_draw_box( b, X - dx, Y + ((H >> 1) - (lh >> 1)), lw + bw, lh, FL_GRAY ); else if ( align & FL_ALIGN_TOP ) fl_draw_box( b, X - dx - bx + ((W >> 1) - (lw >> 1)), Y + ((H >> 1) - (lh >> 1)), lw + bw, lh, FL_GRAY );