otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: fix IGFD parent dir being sorted

Browse source
This commit is contained in:
tildearrow 2023-03-12 01:48:01 -05:00
parent 5ebee2bb2b
commit 7cd4c9535a
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
extern/igfd/ImGuiFileDialog.cpp vendored
View file

@ -132,8 +132,11 @@ namespace IGFD
#define resetButtonString ICON_FA_REPEAT
#endif // resetButtonString
#ifndef drivesButtonString
#define drivesButtonString "Drives"
#define drivesButtonString ICON_FA_HDD_O
#endif // drivesButtonString
#ifndef parentDirString
#define parentDirString ICON_FA_CHEVRON_UP
#endif // parentDirString
#ifndef editPathButtonString
#define editPathButtonString ICON_FA_PENCIL
#endif // editPathButtonString
@ -167,6 +170,9 @@ namespace IGFD
#ifndef buttonResetPathString
#define buttonResetPathString "Reset to current directory"
#endif // buttonResetPathString
#ifndef buttonParentDirString
#define buttonParentDirString "Go to parent directory"
#endif
#ifndef buttonCreateDirString
#define buttonCreateDirString "Create Directory"
#endif // buttonCreateDirString
@ -1475,7 +1481,7 @@ namespace IGFD
infos->fileNameExt_optimized = prOptimizeFilenameForSearchOperations(infos->fileNameExt);
infos->fileType = vFileType;
if (infos->fileNameExt.empty() || (infos->fileNameExt == "." && !vFileDialogInternal.puFilterManager.puDLGFilters.empty())) return; // filename empty or filename is the current dir '.' //-V807
if (infos->fileNameExt.empty() || ((infos->fileNameExt == "." || infos->fileNameExt == "..") && !vFileDialogInternal.puFilterManager.puDLGFilters.empty())) return; // filename empty or filename is the current dir '.' //-V807
if (infos->fileNameExt != ".." && (vFileDialogInternal.puDLGflags & ImGuiFileDialogFlags_DontShowHiddenFiles) && infos->fileNameExt[0] == '.') // dont show hidden files
if (!vFileDialogInternal.puFilterManager.puDLGFilters.empty() || (vFileDialogInternal.puFilterManager.puDLGFilters.empty() && infos->fileNameExt != ".")) // except "." if in directory mode //-V728
return;
@ -2217,6 +2223,16 @@ namespace IGFD
if (ImGui::IsItemHovered())
ImGui::SetTooltip(buttonResetPathString);
ImGui::SameLine();
if (IMGUI_BUTTON(parentDirString))
{
if (SetPathOnParentDirectoryIfAny()) {
OpenCurrentPath(vFileDialogInternal);
}
}
if (ImGui::IsItemHovered())
ImGui::SetTooltip(buttonParentDirString);
#ifdef WIN32
ImGui::SameLine();