From 5e81201a0473a5286c05164b70958fd68e77be50 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Mon, 14 Jun 2004 15:58:52 +0000 Subject: Fl_File_Icon::draw() did not support drawing of complex polygons in icon descriptions. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3457 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 2 ++ src/Fl_File_Icon.cxx | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 3e7e4eb8c..24e24cb58 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ CHANGES IN FLTK 1.1.5rc2 - Documentation updates (STR #365, STR #399, STR #412) + - Fl_File_Icon::draw() did not support drawing of complex + polygons in icon descriptions (STR #???) - The configure script now offers options for JPEG, PNG, and ZLIB libraries (STR #416) - The first menu item in a list would not go invisible diff --git a/src/Fl_File_Icon.cxx b/src/Fl_File_Icon.cxx index 540b916ae..230db3c15 100644 --- a/src/Fl_File_Icon.cxx +++ b/src/Fl_File_Icon.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Icon.cxx,v 1.1.2.16 2004/04/11 04:38:57 easysw Exp $" +// "$Id: Fl_File_Icon.cxx,v 1.1.2.17 2004/06/14 15:58:52 easysw Exp $" // // Fl_File_Icon routines. // @@ -298,11 +298,11 @@ Fl_File_Icon::draw(int x, // I - Upper-lefthand X break; case POLYGON : - fl_end_polygon(); + fl_end_complex_polygon(); break; case OUTLINEPOLYGON : - fl_end_polygon(); + fl_end_complex_polygon(); oc = (Fl_Color)((((unsigned short *)prim)[1] << 16) | ((unsigned short *)prim)[2]); @@ -368,13 +368,13 @@ Fl_File_Icon::draw(int x, // I - Upper-lefthand X case POLYGON : prim = d; d ++; - fl_begin_polygon(); + fl_begin_complex_polygon(); break; case OUTLINEPOLYGON : prim = d; d += 3; - fl_begin_polygon(); + fl_begin_complex_polygon(); break; case VERTEX : @@ -477,5 +477,5 @@ Fl_File_Icon::labeltype(const Fl_Label *o, // I - Label data // -// End of "$Id: Fl_File_Icon.cxx,v 1.1.2.16 2004/04/11 04:38:57 easysw Exp $". +// End of "$Id: Fl_File_Icon.cxx,v 1.1.2.17 2004/06/14 15:58:52 easysw Exp $". // -- cgit v1.2.3