diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2000-06-29 07:23:56 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2000-06-29 07:23:56 +0000 |
| commit | e2e44bfcd5a04334e71114e124ddd90dd28cecb5 (patch) | |
| tree | 09a234f7452242ef2c1630c078106ca46f0be84e /src | |
| parent | 753c53cc7562ae97317f35fa659b5b1bc3827278 (diff) | |
Fixed .gif files in fluid, they were broken by the fix for large .xpm
files in version 1.0.9.
Fix for OpenGL hardware overlays with the transparent index != 0.
Tested on the brand new HP Linux Workstations, this is the only bug
encountered. Both X and OpenGL hardware overlay works perfectly on
these, though configue may not enable it by default...)
Fl_Choice and all other Fl_Menu_ subclasses draw the items using
textcolor() as the default color of the text.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1244 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Gl_Overlay.cxx | 5 | ||||
| -rw-r--r-- | src/Fl_Menu.cxx | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Fl_Gl_Overlay.cxx b/src/Fl_Gl_Overlay.cxx index a1d6ccf58..1bdacb2d9 100644 --- a/src/Fl_Gl_Overlay.cxx +++ b/src/Fl_Gl_Overlay.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.10 2000/06/10 18:24:30 bill Exp $" +// "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.11 2000/06/29 07:23:56 spitzak Exp $" // // OpenGL overlay code for the Fast Light Tool Kit (FLTK). // @@ -75,6 +75,7 @@ public: }; void _Fl_Gl_Overlay::draw() { + if (!valid_) glClearIndex((GLfloat)fl_transparent_pixel); if (damage() != FL_DAMAGE_EXPOSE) glClear(GL_COLOR_BUFFER_BIT); Fl_Gl_Window *w = (Fl_Gl_Window *)parent(); uchar save_valid = w->valid_; @@ -208,5 +209,5 @@ void Fl_Gl_Window::hide_overlay() { #endif // -// End of "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.10 2000/06/10 18:24:30 bill Exp $". +// End of "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.11 2000/06/29 07:23:56 spitzak Exp $". // diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index e57036df3..cfb2943c6 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu.cxx,v 1.18.2.8 2000/06/05 21:20:53 mike Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.9 2000/06/29 07:23:56 spitzak Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -127,7 +127,7 @@ void Fl_Menu_Item::draw(int x, int y, int w, int h, const Fl_Menu_* m, l.type = labeltype_; l.font = labelsize_ ? labelfont_ : uchar(m ? m->textfont() : FL_HELVETICA); l.size = labelsize_ ? labelsize_ : m ? m->textsize() : FL_NORMAL_SIZE; - l.color = labelcolor_ ? labelcolor_ : m ? m->labelcolor() : int(FL_BLACK); + l.color = labelcolor_ ? labelcolor_ : m ? m->textcolor() : int(FL_BLACK); if (!active()) l.color = inactive((Fl_Color)l.color); Fl_Color color = m ? m->color() : FL_GRAY; if (selected) { @@ -737,5 +737,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.8 2000/06/05 21:20:53 mike Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.9 2000/06/29 07:23:56 spitzak Exp $". // |