From 3124794f1fe6e7a5e0e201f6a3e773ed58ad1e5e Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sat, 5 Feb 2005 18:26:21 +0000 Subject: Fl_File_Chooser was slow with large directories (STR #654) FL/Fl_File_Browser.H: - Don't reload the directory view unless asked to. FL/Fl_File_Chooser.H: - Rebuilt using current FLUID. src/Fl_File_Browser.cxx: - Don't reload the directory view unless asked to. src/Fl_File_Chooser.cxx: - Fl_File_Chooser::show() calls rescan(). src/Fl_File_Chooser.fl: - Fl_File_Chooser::show() calls rescan(). src/Fl_File_Chooser2.cxx: - Only call rescan() when chooser is shown. src/Fl_File_Icon.cxx: - Add optimization for Windows - filenames with trailing slash are directories. test/file_chooser.cxx: - Only call show() once... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4010 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_File_Icon.cxx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/Fl_File_Icon.cxx') diff --git a/src/Fl_File_Icon.cxx b/src/Fl_File_Icon.cxx index 230db3c15..61ed3035f 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.17 2004/06/14 15:58:52 easysw Exp $" +// "$Id$" // // Fl_File_Icon routines. // @@ -193,8 +193,10 @@ Fl_File_Icon::find(const char *filename,// I - Name of file */ // Get file information if needed... if (filetype == ANY) { -#ifdef WIN32 - if (fl_filename_isdir(filename)) +#ifdef WIN32 + if (filename[strlen(filename) - 1] == '/') + filetype = DIRECTORY; + else if (fl_filename_isdir(filename)) filetype = DIRECTORY; else filetype = PLAIN; @@ -477,5 +479,5 @@ Fl_File_Icon::labeltype(const Fl_Label *o, // I - Label data // -// End of "$Id: Fl_File_Icon.cxx,v 1.1.2.17 2004/06/14 15:58:52 easysw Exp $". +// End of "$Id$". // -- cgit v1.2.3