diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-30 13:38:15 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-30 13:38:15 +0000 |
| commit | a235545e422d52324a9a9cc524ed59922b32502e (patch) | |
| tree | 2675888face582912dfe85da9120cc4c5469da29 /src | |
| parent | a71a0d21b1ffcce8e873d087abb7368d0ab9493b (diff) | |
Fix prototypes for fl_input() and fl_password().
Change how tabs are colored, and update the tabs demo to show it...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1951 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Tabs.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/Fl_Tabs.cxx b/src/Fl_Tabs.cxx index 96cc0b901..ab4093a34 100644 --- a/src/Fl_Tabs.cxx +++ b/src/Fl_Tabs.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.8 2002/01/29 00:56:19 easysw Exp $" +// "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.9 2002/01/30 13:38:15 easysw Exp $" // // Tab widget for the Fast Light Tool Kit (FLTK). // @@ -254,7 +254,9 @@ void Fl_Tabs::draw_tab(int x1, int x2, int W, int H, Fl_Widget* o, int what) { H += dh; - draw_box(box(), x1, y(), W, H, o->color()); + draw_box(box(), x1, y(), W, H, + sel ? fl_color_average(selection_color(), o->selection_color(), 0.5f) + : o->selection_color()); o->draw_label(x1, y(), W, H, FL_ALIGN_CENTER); @@ -270,7 +272,9 @@ void Fl_Tabs::draw_tab(int x1, int x2, int W, int H, Fl_Widget* o, int what) { H += dh; - draw_box(box(), x1, y() + h() - H, W, H, o->color()); + draw_box(box(), x1, y() + h() - H, W, H, + sel ? fl_color_average(selection_color(), o->selection_color(), 0.5f) + : o->selection_color()); o->draw_label(x1, y() + h() - H, W, H, FL_ALIGN_CENTER); @@ -289,5 +293,5 @@ Fl_Tabs::Fl_Tabs(int X,int Y,int W, int H, const char *l) : } // -// End of "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.8 2002/01/29 00:56:19 easysw Exp $". +// End of "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.9 2002/01/30 13:38:15 easysw Exp $". // |