mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Timeline: Improve the appearance of sequence widget labels.

This commit is contained in:
Jonathan Moore Liles 2012-05-26 20:12:23 -07:00
parent 5eb890d653
commit d7fc792839
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
timeline/src/Sequence_Widget.C
View File

@ -249,8 +249,8 @@ Sequence_Widget::draw_label ( const char *label, Fl_Align align, Fl_Color color,
// lab.type = FL_SHADOW_LABEL; // lab.type = FL_SHADOW_LABEL;
lab.type = FL_NORMAL_LABEL; lab.type = FL_NORMAL_LABEL;
lab.value = label; lab.value = label;
lab.font = FL_HELVETICA; lab.font = FL_HELVETICA_ITALIC;
lab.size = 14; lab.size = 9;
int lw = 0, lh = 0; int lw = 0, lh = 0;
@ -264,25 +264,22 @@ Sequence_Widget::draw_label ( const char *label, Fl_Align align, Fl_Color color,
dx = min( 32767, scroll_x() - abs_x() ); dx = min( 32767, scroll_x() - abs_x() );
const Fl_Boxtype b = FL_ROUNDED_BOX; const Fl_Boxtype b = FL_ROUNDED_BOX;
const int bx = Fl::box_dx( b ) + 1; const int bx = Fl::box_dx( b ) + 2;
const int bw = Fl::box_dw( b ) + 1; const int bw = Fl::box_dw( b ) + 4;
// const int by = Fl::box_dy( b ) + 1; const int by = Fl::box_dy( b ) + 2;
const int bh = Fl::box_dh( b ) + 1; const int bh = Fl::box_dh( b ) + 4;
/* FIXME: why do we have to do this here? why doesn't Fl_Label::draw take care of this stuff? */ /* FIXME: why do we have to do this here? why doesn't Fl_Label::draw take care of this stuff? */
if ( align & FL_ALIGN_INSIDE ) if ( align & FL_ALIGN_INSIDE )
{ {
X += Fl::box_dx( box() );
Y += Fl::box_dy( box() );
W -= Fl::box_dw( box() );
H -= Fl::box_dh( box() );
if ( align & FL_ALIGN_RIGHT ) if ( align & FL_ALIGN_RIGHT )
X += abs_w() - (lw + bw); X += abs_w() - (lw + bw);
if ( align & FL_ALIGN_BOTTOM ) if ( align & FL_ALIGN_BOTTOM )
Y += h() - (lh + (bh << 1)); {
Y += h() - (lh + bh);
X += 2;
}
} }
else else
{ {
@ -297,10 +294,11 @@ Sequence_Widget::draw_label ( const char *label, Fl_Align align, Fl_Color color,
Y -= lh + bh; Y -= lh + bh;
} }
fl_draw_box( b, ( X - dx ), Y, lw + bw, lh, FL_GRAY ); fl_draw_box( b, ( X - dx ), Y - by, lw + bw, lh + bh, fl_color_add_alpha( FL_DARK1, 150 ) );
fl_color( color ); fl_color( color );
fl_draw( label, ( X - dx ) + bx, Y, lw, lh, (Fl_Align)(FL_ALIGN_LEFT | FL_ALIGN_CENTER ) );
fl_draw( label, ( X - dx ), Y, lw + bw, lh, (Fl_Align)(FL_ALIGN_CENTER) );
if ( align & FL_ALIGN_CLIP ) fl_pop_clip(); if ( align & FL_ALIGN_CLIP ) fl_pop_clip();
} }