[RFR] : refactor

Author: aiekick

ImGuiFileDialog.cpp

@@ -183,11 +183,6 @@ namespace IGFD
 #ifndef tableHeaderFileDateString
 #define tableHeaderFileDateString "Date"
 #endif // tableHeaderFileDateString
-#ifdef USE_THUMBNAILS
-#ifndef tableHeaderFileThumbnailsString
-#define tableHeaderFileThumbnailsString "Thumbnails"
-#endif // tableHeaderFileThumbnailsString
-#endif // USE_THUMBNAILS
 #ifndef OverWriteDialogTitleString
 #define OverWriteDialogTitleString "The file Already Exist !"
 #endif // OverWriteDialogTitleString
@@ -206,6 +201,9 @@ namespace IGFD
 #endif // DateTimeFormat
 
 #ifdef USE_THUMBNAILS
+#ifndef tableHeaderFileThumbnailsString
+#define tableHeaderFileThumbnailsString "Thumbnails"
+#endif // tableHeaderFileThumbnailsString
 #ifndef DisplayMode_FilesList_ButtonString
 #define DisplayMode_FilesList_ButtonString "FL"
 #endif // DisplayMode_FilesList_ButtonString
@@ -224,6 +222,9 @@ namespace IGFD
 #ifndef DisplayMode_ThumbailsGrid_ButtonHelp
 #define DisplayMode_ThumbailsGrid_ButtonHelp "Thumbnails Grid"
 #endif // DisplayMode_ThumbailsGrid_ButtonHelp
+#ifndef DisplayMode_ThumbailsList_ImageHeight 
+#define DisplayMode_ThumbailsList_ImageHeight 32.0f
+#endif // DisplayMode_ThumbailsList_ImageHeight
 #ifndef IMGUI_RADIO_BUTTON
 	inline bool inRadioButton(const char* vLabel, bool vToggled)
 	{
@@ -250,11 +251,6 @@ namespace IGFD
 	}
 #define IMGUI_RADIO_BUTTON inRadioButton
 #endif // IMGUI_RADIO_BUTTON
-#ifndef DisplayMode_ThumbailsList_ImageHeight 
-#define DisplayMode_ThumbailsList_ImageHeight 32.0f
-#endif // DisplayMode_ThumbailsList_ImageHeight
-	static IGFD::CreateThumbnailFun sCreateThumbnailFun = nullptr;
-	static IGFD::DestroyThumbnailFun sDestroyThumbnailFun = nullptr;
 #endif  // USE_THUMBNAILS
 
 #ifdef USE_BOOKMARK
@@ -404,12 +400,12 @@ namespace IGFD
 #ifdef WIN32
 		const DWORD mydrives = 2048;
 		char lpBuffer[2048];
-		const DWORD countChars = GetLogicalDriveStringsA(mydrives, lpBuffer);
-		if (countChars > 0)
-		{
 #define mini(a,b) (((a) < (b)) ? (a) : (b))
-			std::string var = std::string(lpBuffer, (size_t)mini(countChars, 2047));
+		const DWORD countChars = mini(GetLogicalDriveStringsA(mydrives, lpBuffer), 2047);
 #undef mini
+		if (countChars > 0)
+		{
+			std::string var = std::string(lpBuffer, (size_t)countChars);
 			inReplaceString(var, "\\", "");
 			res = inSplitStringToVector(var, '\0', false);
 		}

ImGuiFileDialogConfig.h

@@ -13,6 +13,7 @@
 //#define DONT_DEFINE_AGAIN__STB_IMAGE_RESIZE_IMPLEMENTATION
 //#define IMGUI_RADIO_BUTTON RadioButton
 //#define DisplayMode_ThumbailsList_ImageHeight 32.0f
+//#define tableHeaderFileThumbnailsString "Thumbnails"
 //#define DisplayMode_FilesList_ButtonString "FL"
 //#define DisplayMode_FilesList_ButtonHelp "File List"
 //#define DisplayMode_ThumbailsList_ButtonString "TL"
@@ -21,6 +22,7 @@
 //#define DisplayMode_ThumbailsGrid_ButtonString "TG"
 //#define DisplayMode_ThumbailsGrid_ButtonHelp "Thumbnails Grid"
 
+
 //#define USE_EXPLORATION_BY_KEYS
 // this mapping by default is for GLFW but you can use another
 //#include <GLFW/glfw3.h>