From 71a9355a9e847dd7865865836f883776bad2e101 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Fri, 24 May 2024 03:51:35 -0500 Subject: [PATCH] i may have done --- src/gui/fileDialog.cpp | 8 ++++---- src/gui/fileDialog.h | 4 ++-- src/gui/gui.cpp | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/gui/fileDialog.cpp b/src/gui/fileDialog.cpp index cd5116414..c0ea6159d 100644 --- a/src/gui/fileDialog.cpp +++ b/src/gui/fileDialog.cpp @@ -110,7 +110,7 @@ void FurnaceGUIFileDialog::convertFilterList(std::vector& filter) { strncpy(noSysFilter,result.c_str(),4095); } -bool FurnaceGUIFileDialog::openLoad(String header, std::vector filter, String path, double dpiScale, FileDialogSelectCallback clickCallback, bool allowMultiple) { +bool FurnaceGUIFileDialog::openLoad(String header, std::vector filter, String path, double dpiScale, FileDialogSelectCallback clickCallback, bool allowMultiple, String hint) { if (opened) return false; saving=false; curPath=path; @@ -189,13 +189,13 @@ bool FurnaceGUIFileDialog::openLoad(String header, std::vector filter, S ImGuiFileDialog::Instance()->DpiScale=dpiScale; ImGuiFileDialog::Instance()->mobileMode=mobileUI; ImGuiFileDialog::Instance()->homePath=getHomeDir(); - ImGuiFileDialog::Instance()->OpenModal("FileDialog",header,noSysFilter,path,allowMultiple?999:1,nullptr,0,clickCallback); + ImGuiFileDialog::Instance()->OpenModal("FileDialog",header,noSysFilter,path,hint,allowMultiple?999:1,nullptr,0,clickCallback); } opened=true; return true; } -bool FurnaceGUIFileDialog::openSave(String header, std::vector filter, String path, double dpiScale) { +bool FurnaceGUIFileDialog::openSave(String header, std::vector filter, String path, double dpiScale, String hint) { if (opened) return false; #ifdef ANDROID @@ -275,7 +275,7 @@ bool FurnaceGUIFileDialog::openSave(String header, std::vector filter, S ImGuiFileDialog::Instance()->DpiScale=dpiScale; ImGuiFileDialog::Instance()->mobileMode=mobileUI; ImGuiFileDialog::Instance()->homePath=getHomeDir(); - ImGuiFileDialog::Instance()->OpenModal("FileDialog",header,noSysFilter,path,1,nullptr,ImGuiFileDialogFlags_ConfirmOverwrite); + ImGuiFileDialog::Instance()->OpenModal("FileDialog",header,noSysFilter,path,hint,1,nullptr,ImGuiFileDialogFlags_ConfirmOverwrite); } opened=true; return true; diff --git a/src/gui/fileDialog.h b/src/gui/fileDialog.h index 1a34ca1bc..d1584ce85 100644 --- a/src/gui/fileDialog.h +++ b/src/gui/fileDialog.h @@ -51,8 +51,8 @@ class FurnaceGUIFileDialog { void convertFilterList(std::vector& filter); public: bool mobileUI; - bool openLoad(String header, std::vector filter, String path, double dpiScale, FileDialogSelectCallback clickCallback=NULL, bool allowMultiple=false); - bool openSave(String header, std::vector filter, String path, double dpiScale); + bool openLoad(String header, std::vector filter, String path, double dpiScale, FileDialogSelectCallback clickCallback=NULL, bool allowMultiple=false, String hint=""); + bool openSave(String header, std::vector filter, String path, double dpiScale, String hint=""); bool accepted(); void close(); bool render(const ImVec2& min, const ImVec2& max); diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 1ece8e4b2..c7e3ac8d3 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -1649,7 +1649,7 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) { "Open File", {"compatible files", "*.fur *.dmf *.mod *.fc13 *.fc14 *.smod *.fc *.ftm *.0cc *.dnm *.eft *.fub *.tfe", "all files", "*"}, - workingDirSong+"/CRAP", + workingDirSong, dpiScale ); break; @@ -1756,7 +1756,8 @@ void FurnaceGUI::openFileDialog(FurnaceGUIFileDialogs type) { "Save Instrument", {"Furnace instrument", "*.fui"}, workingDirIns, - dpiScale + dpiScale, + (settings.autoFillSave)?e->getIns(curIns)->name:"" ); break; case GUI_FILE_INS_SAVE_DMP: