mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix inconsistency regarding filebox multi_select

Browse Source 
When only one file is selected, the lpstrFile variable contains only the path to that file, without the parent path before that, thus, the targets vector is empty and the path variable contains the actual path to the file. This is inconsistent with the scenario where multiple files are selected, in which targets contains the file paths and path contains the parent directory path.
This commit is contained in:
Zaha Mihai 2019-09-01 17:53:23 +03:00 committed by GitHub
parent 3cb7dfae02
commit 7c442360ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/gui/filebox.cpp
View File

@ -1517,6 +1517,15 @@ namespace nana
path_type parent_path{ str }; path_type parent_path{ str };
str += (len + 1); str += (len + 1);
// if only one file was selected, the ofn.lpstrFile
// is returning only that file, without any parent
if (!*str)
{
targets.emplace_back(parent_path);
impl_->path = parent_path.parent_path().u8string();
}
else
{
while(*str) while(*str)
{ {
len = ::wcslen(str); len = ::wcslen(str);
@ -1525,6 +1534,7 @@ namespace nana
} }
impl_->path = parent_path.u8string(); impl_->path = parent_path.u8string();
} }
}
else else
{ {
wfile.resize(std::wcslen(wfile.data())); wfile.resize(std::wcslen(wfile.data()));