Merge branch 'Lib_Only' of https://github.com/aiekick/ImGuiFileDialog into Lib_Only

Author: aiekick

ImGuiFileDialog.cpp

@@ -169,7 +169,7 @@ namespace IGFD
 #endif // OverWriteDialogCancelButtonString
 // see strftime functionin <ctime> for customize
 #ifndef DateTimeFormat
-#define DateTimeFormat "%Y/%m/%d %H:%M:%S"
+#define DateTimeFormat "%Y/%m/%d %H:%M"
 #endif // DateTimeFormat
 
 #ifdef USE_BOOKMARK
@@ -1302,64 +1302,36 @@ namespace IGFD
 							else
 								str = fileEntryString + str;
 						}
-						bool selected = false;
-						if (m_SelectedFileNames.find(infos.fileName) != m_SelectedFileNames.end()) // found
-							selected = true;
+						bool selected = (m_SelectedFileNames.find(infos.fileName) != m_SelectedFileNames.end()); // found
 						ImGui::TableNextRow();
-						if (ImGui::TableSetColumnIndex(0)) // first column
-						{
-							ImGuiSelectableFlags selectableFlags = ImGuiSelectableFlags_AllowDoubleClick;
-							selectableFlags |=
-								ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_SpanAvailWidth;
 
-							bool _selectablePressed = false;
-#ifdef USE_EXPLORATION_BY_KEYS
-							bool flashed = BeginFlashItem(i);
-							_selectablePressed = FlashableSelectable(str.c_str(), selected, selectableFlags,
-								flashed);
-							if (flashed)
-								EndFlashItem();
-#else // USE_EXPLORATION_BY_KEYS
-							_selectablePressed = ImGui::Selectable(str.c_str(), selected, selectableFlags);
-#endif // USE_EXPLORATION_BY_KEYS
-							if (_selectablePressed)
-							{
-								if (infos.type == 'd')
-								{
-									if (!dlg_filters.empty() || ImGui::IsMouseDoubleClicked(0))
-									{
-										m_PathClicked = SelectDirectory(infos);
-									}
-									else // directory chooser
-									{
-										SelectFileName(infos);
-									}
-
-									if (showColor)
-										ImGui::PopStyleColor();
+						bool needToBreakTheloop = false;
 
-									break;
-								}
-								else
-								{
-									SelectFileName(infos);
-								}
-							}
+						if (ImGui::TableSetColumnIndex(0)) // first column
+						{
+							needToBreakTheloop = SelectableItem(i, infos, selected, str.c_str());
 						}
 						if (ImGui::TableSetColumnIndex(1)) // second column
 						{
 							if (infos.type != 'd')
 							{
-								ImGui::Text("%s ", infos.formatedFileSize.c_str()); //-V111
+								needToBreakTheloop = SelectableItem(i, infos, selected, "%s ", infos.formatedFileSize.c_str());
+							}
+							else
+							{
+								needToBreakTheloop = SelectableItem(i, infos, selected, "");
 							}
 						}
 						if (ImGui::TableSetColumnIndex(2)) // third column
 						{
-							ImGui::Text("%s", infos.fileModifDate.c_str()); //-V111
+							needToBreakTheloop = SelectableItem(i, infos, selected, "%s", infos.fileModifDate.c_str());
 						}
+
 						if (showColor)
 							ImGui::PopStyleColor();
 
+						if (needToBreakTheloop)
+							break;
 					}
 				}
 				m_FileListClipper.End();
@@ -1401,6 +1373,50 @@ namespace IGFD
 		ImGui::EndChild();
 	}
 
+	bool IGFD::FileDialog::SelectableItem(int vidx, const FileInfoStruct& vInfos, bool vSelected, const char* vFmt, ...)
+	{
+		static ImGuiSelectableFlags selectableFlags = ImGuiSelectableFlags_AllowDoubleClick | 
+			ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_SpanAvailWidth;
+
+		va_list args;
+		va_start(args, vFmt);
+		vsnprintf(VariadicBuffer, MAX_FILE_DIALOG_NAME_BUFFER, vFmt, args);
+		va_end(args);
+
+#ifdef USE_EXPLORATION_BY_KEYS
+		bool flashed = BeginFlashItem(vidx);
+		bool res = FlashableSelectable(VariadicBuffer, vSelected, selectableFlags,
+			flashed);
+		if (flashed)
+			EndFlashItem();
+#else // USE_EXPLORATION_BY_KEYS
+		(void)vidx; // remove a warnings ofr unused var
+		bool res = ImGui::Selectable(VariadicBuffer, vSelected, selectableFlags);
+#endif // USE_EXPLORATION_BY_KEYS
+		if (res)
+		{
+			if (vInfos.type == 'd')
+			{
+				if (ImGui::IsMouseDoubleClicked(0))
+				{
+					m_PathClicked = SelectDirectory(vInfos);
+				}
+				else if (dlg_filters.empty()) // directory chooser
+				{
+					SelectFileName(vInfos);
+				}
+
+				return true; // needToBreakTheloop
+			}
+			else
+			{
+				SelectFileName(vInfos);
+			}
+		}
+
+		return false;
+	}
+
 	void IGFD::FileDialog::DrawSidePane(float vHeight)
 	{
 		ImGui::SameLine();

ImGuiFileDialog.h

@@ -643,6 +643,8 @@ namespace IGFD
 		char FileNameBuffer[MAX_FILE_DIALOG_NAME_BUFFER] = "";
 		char DirectoryNameBuffer[MAX_FILE_DIALOG_NAME_BUFFER] = "";
 		char SearchBuffer[MAX_FILE_DIALOG_NAME_BUFFER] = "";
+		char VariadicBuffer[MAX_FILE_DIALOG_NAME_BUFFER] = "";
+
 #ifdef USE_BOOKMARK
 		char BookmarkEditBuffer[MAX_FILE_DIALOG_NAME_BUFFER] = "";
 #endif // USE_BOOKMARK
@@ -819,6 +821,7 @@ namespace IGFD
 		virtual void DrawBookMark();								// draw bookmark button
 #endif // USE_BOOKMARK
 		// others
+		bool SelectableItem(int vidx, const FileInfoStruct& vInfos, bool vSelected, const char* vFmt, ...);					// selectable item for table
 		void ResetEvents();																									// reset events (path, drives, continue)
 		void SetDefaultFileName(const std::string& vFileName);																// set default fiel name
 		bool SelectDirectory(const FileInfoStruct& vInfos);																	// enter directory 

ImGuiFileDialogConfig.h

@@ -47,7 +47,7 @@
 
 // DateTimeFormat
 // see strftime functionin <ctime> for customize
-// "%Y/%m/%d %H:%M:%S" give 2021:01:22 11:47:10
+// "%Y/%m/%d %H:%M" give 2021:01:22 11:47
 // "%Y/%m/%d %i:%M%p" give 2021:01:22 11:45PM
 //#define DateTimeFormat "%Y/%m/%d %i:%M%p"