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

GUI: prepare for multiple asset load

Browse source
This commit is contained in:
tildearrow 2022-10-16 19:40:14 -05:00
parent 6216e286f8
commit 81a2bce4d4
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extern/igfd/ImGuiFileDialog.cpp vendored
View file

@ -3993,7 +3993,13 @@ namespace IGFD
} else { } else {
fdi.SelectFileName(prFileDialogInternal, vInfos); fdi.SelectFileName(prFileDialogInternal, vInfos);
if (prFileDialogInternal.puDLGselFun!=NULL) { if (prFileDialogInternal.puDLGselFun!=NULL) {
prFileDialogInternal.puDLGselFun(GetFilePathName().c_str()); std::string argPath;
for (auto& i: GetSelection()) {
argPath=i.second;
}
if (!argPath.empty()) {
prFileDialogInternal.puDLGselFun(argPath.c_str());
}
} }
} }
} }

17
src/gui/gui.cpp
View file

@ -1759,7 +1759,14 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
"all files", ".*"}, "all files", ".*"},
"compatible files{.fur,.dmf,.mod},another option{.wav,.ttf},.*", "compatible files{.fur,.dmf,.mod},another option{.wav,.ttf},.*",
workingDirTest, workingDirTest,
dpiScale dpiScale,
[](const char* path) {
if (path!=NULL) {
logI("Callback Result: %s",path);
} else {
logI("Callback Result: NULL");
}
}
); );
break; break;
case GUI_FILE_TEST_OPEN_MULTI: case GUI_FILE_TEST_OPEN_MULTI:
@ -1772,7 +1779,13 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) {
"compatible files{.fur,.dmf,.mod},another option{.wav,.ttf},.*", "compatible files{.fur,.dmf,.mod},another option{.wav,.ttf},.*",
workingDirTest, workingDirTest,
dpiScale, dpiScale,
NULL, [](const char* path) {
if (path!=NULL) {
logI("Callback Result: %s",path);
} else {
logI("Callback Result: NULL");
}
},
true true
); );
break; break;