mirror of
https://github.com/fltk/fltk.git
synced 2026-06-06 16:46:52 +08:00
More color fixes from Bill - contrast function not right, and moved
fl_color_average() to be a non-public method. git-svn-id: file:///fltk/svn/fltk/trunk@213 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
+3
-6
@@ -1,5 +1,5 @@
|
||||
//
|
||||
// "$Id: Enumerations.H,v 1.9 1999/01/07 19:16:49 mike Exp $"
|
||||
// "$Id: Enumerations.H,v 1.10 1999/01/13 15:56:22 mike Exp $"
|
||||
//
|
||||
// Enumerations for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
@@ -277,10 +277,7 @@ enum Fl_Color { // standard colors
|
||||
FL_COLOR_CUBE = 56
|
||||
};
|
||||
|
||||
Fl_Color fl_color_average(Fl_Color color1, Fl_Color color2, float weight);
|
||||
inline Fl_Color inactive(Fl_Color c) { return fl_color_average(c, FL_GRAY, .33); }
|
||||
inline Fl_Color fl_lighter(Fl_Color c) { return fl_color_average(c, FL_WHITE, .67); }
|
||||
inline Fl_Color fl_darker(Fl_Color c) { return fl_color_average(c, FL_BLACK, .67); }
|
||||
Fl_Color inactive(Fl_Color c);
|
||||
Fl_Color contrast(Fl_Color fg, Fl_Color bg);
|
||||
#define FL_NUM_GRAY 24
|
||||
inline Fl_Color fl_gray_ramp(int i) {return (Fl_Color)(i+FL_GRAY_RAMP);}
|
||||
@@ -350,5 +347,5 @@ enum Fl_Damage {
|
||||
#endif
|
||||
|
||||
//
|
||||
// End of "$Id: Enumerations.H,v 1.9 1999/01/07 19:16:49 mike Exp $".
|
||||
// End of "$Id: Enumerations.H,v 1.10 1999/01/13 15:56:22 mike Exp $".
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user