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

GUI: fix file path corruption on sys file picker

Browse source
This commit is contained in:
tildearrow 2022-04-11 03:14:12 -05:00
parent ac286fc8d1
commit 7bb0743598
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gui/fileDialog.cpp
View file

@ -8,6 +8,7 @@ bool FurnaceGUIFileDialog::openLoad(String header, std::vector<String> filter, c
if (opened) return false; if (opened) return false;
saving=false; saving=false;
curPath=path; curPath=path;
logD("opening load file dialog with curPath %s",curPath);
if (sysDialog) { if (sysDialog) {
dialogO=new pfd::open_file(header,path,filter); dialogO=new pfd::open_file(header,path,filter);
} else { } else {
@ -22,6 +23,7 @@ bool FurnaceGUIFileDialog::openSave(String header, std::vector<String> filter, c
if (opened) return false; if (opened) return false;
saving=true; saving=true;
curPath=path; curPath=path;
logD("opening save file dialog with curPath %s",curPath);
if (sysDialog) { if (sysDialog) {
dialogS=new pfd::save_file(header,path,filter); dialogS=new pfd::save_file(header,path,filter);
} else { } else {
@ -65,6 +67,8 @@ bool FurnaceGUIFileDialog::render(const ImVec2& min, const ImVec2& max) {
if (dialogS!=NULL) { if (dialogS!=NULL) {
if (dialogS->ready(0)) { if (dialogS->ready(0)) {
fileName=dialogS->result(); fileName=dialogS->result();
size_t dsPos=fileName.rfind(DIR_SEPARATOR);
if (dsPos!=String::npos) curPath=fileName.substr(0,dsPos);
logD("returning %s",fileName.c_str()); logD("returning %s",fileName.c_str());
return true; return true;
} }
@ -77,6 +81,8 @@ bool FurnaceGUIFileDialog::render(const ImVec2& min, const ImVec2& max) {
logD("returning nothing"); logD("returning nothing");
} else { } else {
fileName=dialogO->result()[0]; fileName=dialogO->result()[0];
size_t dsPos=fileName.rfind(DIR_SEPARATOR);
if (dsPos!=String::npos) curPath=fileName.substr(0,dsPos);
logD("returning %s",fileName.c_str()); logD("returning %s",fileName.c_str());
} }
return true; return true;
@ -91,8 +97,15 @@ bool FurnaceGUIFileDialog::render(const ImVec2& min, const ImVec2& max) {
String FurnaceGUIFileDialog::getPath() { String FurnaceGUIFileDialog::getPath() {
if (sysDialog) { if (sysDialog) {
if (curPath.size()>0) {
if (curPath[curPath.size()-1]==DIR_SEPARATOR) {
curPath=curPath.substr(0,curPath.size()-1);
}
}
logD("curPath: %s",curPath);
return curPath; return curPath;
} else { } else {
logD("curPath: %s",ImGuiFileDialog::Instance()->GetCurrentPath());
return ImGuiFileDialog::Instance()->GetCurrentPath(); return ImGuiFileDialog::Instance()->GetCurrentPath();
} }
} }