TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

corrects native file dialogue return values

Browse source
This commit is contained in:
Azaezel 2016-05-09 06:43:47 -05:00
parent 6caafc9844
commit 5958e86e9a
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/platform/nativeDialogs/fileDialog.cpp
View file

@ -210,14 +210,14 @@ bool FileDialog::Execute()
} }
String strippedFilters = suffix; String strippedFilters = suffix;
strippedFilters.replace(";",","); strippedFilters.replace(";",",");
strippedFilters += String(";") + suffix; strippedFilters += String(";") + suffix;
// Get the current working directory, so we can back up to it once Windows has // Get the current working directory, so we can back up to it once Windows has
// done its craziness and messed with it. // done its craziness and messed with it.
StringTableEntry cwd = Platform::getCurrentDirectory(); StringTableEntry cwd = Platform::getCurrentDirectory();
if (mData.mDefaultPath == StringTable->lookup("") || !Platform::isDirectory(mData.mDefaultPath)) if (mData.mDefaultPath == StringTable->lookup("") || !Platform::isDirectory(mData.mDefaultPath))
mData.mDefaultPath = cwd; mData.mDefaultPath = cwd;
String rootDir = String(cwd);
// Execute Dialog (Blocking Call) // Execute Dialog (Blocking Call)
nfdchar_t *outPath = NULL; nfdchar_t *outPath = NULL;
nfdpathset_t pathSet; nfdpathset_t pathSet;
@ -226,6 +226,7 @@ bool FileDialog::Execute()
String defaultPath = String(mData.mDefaultPath); String defaultPath = String(mData.mDefaultPath);
#if defined(TORQUE_OS_WIN) #if defined(TORQUE_OS_WIN)
defaultPath.replace("/", "\\"); defaultPath.replace("/", "\\");
rootDir.replace("/", "\\");
#endif #endif
if (mData.mStyle & FileDialogData::FDS_OPEN) if (mData.mStyle & FileDialogData::FDS_OPEN)
@ -235,6 +236,11 @@ bool FileDialog::Execute()
else if (mData.mStyle & FileDialogData::FDS_MULTIPLEFILES) else if (mData.mStyle & FileDialogData::FDS_MULTIPLEFILES)
result = NFD_OpenDialogMultiple(strippedFilters.c_str(), defaultPath.c_str(), &pathSet); result = NFD_OpenDialogMultiple(strippedFilters.c_str(), defaultPath.c_str(), &pathSet);
String resultPath = String(outPath).replace(rootDir, String(""));
resultPath = resultPath.replace(0, 1, String("")).c_str(); //kill '\\' prefix
resultPath = resultPath.replace(String("\\"), String("/"));
// Did we select a file? // Did we select a file?
if (result != NFD_OKAY) if (result != NFD_OKAY)
{ {
@ -245,7 +251,7 @@ bool FileDialog::Execute()
if (mData.mStyle & FileDialogData::FDS_OPEN || mData.mStyle & FileDialogData::FDS_SAVE) if (mData.mStyle & FileDialogData::FDS_OPEN || mData.mStyle & FileDialogData::FDS_SAVE)
{ {
// Single file selection, do it the easy way // Single file selection, do it the easy way
mData.mFile = StringTable->insert(outPath); mData.mFile = Platform::makeRelativePathName(resultPath.c_str(), NULL);
} }
else if (mData.mStyle & FileDialogData::FDS_MULTIPLEFILES) else if (mData.mStyle & FileDialogData::FDS_MULTIPLEFILES)
{ {
@ -265,7 +271,7 @@ bool FileDialog::Execute()
else else
{ {
//nope, just one file, so set it as normal //nope, just one file, so set it as normal
setDataField(StringTable->insert("files"), "0", outPath); setDataField(StringTable->insert("files"), "0", Platform::makeRelativePathName(resultPath.c_str(), NULL));
setDataField(StringTable->insert("fileCount"), NULL, "1"); setDataField(StringTable->insert("fileCount"), NULL, "1");
} }
} }