diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-11 10:46:19 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-11 10:46:19 +0000 |
| commit | ef36be385e5bedc22f5e1da11b5eca4a55d3c0b5 (patch) | |
| tree | 4b8ba90bd67e80284d77f4cccdf697706cad9cb9 /src/fl_color.cxx | |
| parent | a9b5c825a4b86454fc1aedccb07dd91713ee8873 (diff) | |
Redefine FL_ color values to use the color cube.
Add FL_BACKGROUND_COLOR, FL_BACKGROUND2_COLOR, and FL_FOREGROUND_COLOR,
and use them instead of FL_GRAY, FL_WHITE, and FL_BLACK, respectively.
(FL_GRAY defined to FL_BACKGROUND_COLOR for back-compatibility)
Add fl_rgb_color(uchar g) inline method to map 8-bit grayscale to
24-bit RGB color.
Doco updates for all of this...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2072 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_color.cxx')
| -rw-r--r-- | src/fl_color.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fl_color.cxx b/src/fl_color.cxx index cb4101239..0d2fbc683 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_color.cxx,v 1.12.2.5.2.5 2002/01/01 15:11:32 easysw Exp $" +// "$Id: fl_color.cxx,v 1.12.2.5.2.6 2002/04/11 10:46:19 easysw Exp $" // // Color functions for the Fast Light Tool Kit (FLTK). // @@ -366,11 +366,11 @@ Fl_Color fl_contrast(Fl_Color fg, Fl_Color bg) { if ((c1^c2)&0x80800000) return fg; else if (c2&0x80800000) - return FL_GRAY_RAMP; // black from gray ramp + return FL_BLACK; else - return (Fl_Color)(FL_COLOR_CUBE-1); // white from gray ramp + return FL_WHITE; } // -// End of "$Id: fl_color.cxx,v 1.12.2.5.2.5 2002/01/01 15:11:32 easysw Exp $". +// End of "$Id: fl_color.cxx,v 1.12.2.5.2.6 2002/04/11 10:46:19 easysw Exp $". // |