Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed old inactive function.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/trunk@192 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
1999-01-07 16:57:39 +00:00
parent 42aab2a991
commit 975612bbe3
2 changed files with 4 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fl_color.cxx
+2 -21
View File
@@ -1,5 +1,5 @@
//
// "$Id: fl_color.cxx,v 1.7 1999/01/07 16:40:58 mike Exp $"
// "$Id: fl_color.cxx,v 1.8 1999/01/07 16:57:39 mike Exp $"
//
// Color functions for the Fast Light Tool Kit (FLTK).
//
@@ -275,25 +275,6 @@ void fl_color(Fl_Color i) {
// bright/dark is decided based on high bits of green:
#define bright(x) ((x)&0xc00000)
Fl_Color inactive(Fl_Color c) {
Fl_Color i;
unsigned incolor = fl_cmap[c];
unsigned gray = fl_cmap[FL_GRAY];
uchar r, g, b;
r = ((uchar)(incolor>>24))/3 + ((uchar)(gray>>24))/3 * 2;
g = ((uchar)(incolor>>16))/3 + ((uchar)(gray>>16))/3 * 2;
b = ((uchar)(incolor>>8))/3 + ((uchar)(gray>>8))/3 * 2;
if (r == g && r == b) { // get it out of gray ramp
i = fl_gray_ramp(r*FL_NUM_GRAY/256);
} else { // get it out of color cube:
i = fl_color_cube(r*FL_NUM_RED/256,g*FL_NUM_GREEN/256,b*FL_NUM_BLUE/256);
}
return i;
}
Fl_Color fl_color_average(Fl_Color color1, Fl_Color color2, float weight) {
Fl_Color avg;
unsigned rgb1 = fl_cmap[color1];
@@ -372,5 +353,5 @@ void Fl::get_color(Fl_Color i, uchar &red, uchar &green, uchar &blue) {
#endif
//
// End of "$Id: fl_color.cxx,v 1.7 1999/01/07 16:40:58 mike Exp $".
// End of "$Id: fl_color.cxx,v 1.8 1999/01/07 16:57:39 mike Exp $".
//
src/fl_color_win32.cxx
+2 -21
View File
@@ -1,5 +1,5 @@
//
// "$Id: fl_color_win32.cxx,v 1.11 1999/01/07 16:40:58 mike Exp $"
// "$Id: fl_color_win32.cxx,v 1.12 1999/01/07 16:56:43 mike Exp $"
//
// WIN32 color functions for the Fast Light Tool Kit (FLTK).
//
@@ -147,25 +147,6 @@ CREATE_BRUSH:
return brushes[i].brush;
}
Fl_Color inactive(Fl_Color c) {
Fl_Color i;
unsigned incolor = fl_cmap[c];
unsigned gray = fl_cmap[FL_GRAY];
uchar r, g, b;
r = ((uchar)(incolor>>24))/3 + ((uchar)(gray>>24))/3 * 2;
g = ((uchar)(incolor>>16))/3 + ((uchar)(gray>>16))/3 * 2;
b = ((uchar)(incolor>>8))/3 + ((uchar)(gray>>8))/3 * 2;
if (r == g && r == b) { // get it out of gray ramp
i = fl_gray_ramp(r*FL_NUM_GRAY/256);
} else { // get it out of color cube:
i = fl_color_cube(r*FL_NUM_RED/256,g*FL_NUM_GREEN/256,b*FL_NUM_BLUE/256);
}
return i;
}
Fl_Color fl_color_average(Fl_Color color1, Fl_Color color2, float weight) {
Fl_Color avg;
unsigned rgb1 = fl_cmap[color1];
@@ -271,5 +252,5 @@ fl_select_palette(void)
#endif
//
// End of "$Id: fl_color_win32.cxx,v 1.11 1999/01/07 16:40:58 mike Exp $".
// End of "$Id: fl_color_win32.cxx,v 1.12 1999/01/07 16:56:43 mike Exp $".
//