caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fix open/save dialogue on windows (#983)

Browse Source 
* minor fix open/save dialogue on windows 

On windows 10 the open/save dialogue box has an minor error, and I believe I fixed it. 

When "Open" is selected from the menu, the title of the dialogue box says "SolveSpace - Save File" and the entered file name is "united". My fix correctly titles the dialoged box, and leaves the address bar blank when a file is being opened because "united" is only needed as a default name when a file being saved. 

I found that class FileDialogImplWin32 from guiwin.cpp contains two if statements for "isSaveDialog". This is redundant. I removed the first where the title was originally set, but not working. I then set the title in the second if statement and moved the 'if isEmpty'' to this section.

* Update guiwin.cpp

replaced tabs with spaces
This commit is contained in:
dustinhartlyn 2021-04-01 06:24:04 -07:00 committed by GitHub
parent 5c3ce9bfc2
commit 6b94af0765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/platform/guiwin.cpp
View File

@ -1583,11 +1583,6 @@ public:
ofn.nMaxFile = sizeof(filenameWC) / sizeof(wchar_t); ofn.nMaxFile = sizeof(filenameWC) / sizeof(wchar_t);
ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY |
OFN_OVERWRITEPROMPT; OFN_OVERWRITEPROMPT;
if(isSaveDialog) {
SetTitle(C_("title", "Save File"));
} else {
SetTitle(C_("title", "Open File"));
}
} }
void SetTitle(std::string title) override { void SetTitle(std::string title) override {
@ -1640,13 +1635,14 @@ public:
} }
bool RunModal() override { bool RunModal() override {
if(GetFilename().IsEmpty()) {
SetFilename(Path::From(_("untitled")));
}
if(isSaveDialog) { if(isSaveDialog) {
SetTitle(C_("title", "Save File"));
if(GetFilename().IsEmpty()) {
SetFilename(Path::From(_("untitled")));
}
return GetSaveFileNameW(&ofn) == TRUE; return GetSaveFileNameW(&ofn) == TRUE;
} else { } else {
SetTitle(C_("title", "Open File"));
return GetOpenFileNameW(&ofn) == TRUE; return GetOpenFileNameW(&ofn) == TRUE;
} }
} }