Merge branch 'fix_filebox_multi_select' of https://github.com/mihaizh/nana into mihaizh-fix_filebox_multi_select

This commit is contained in:
Jinhao
2019-09-02 05:27:01 +08:00
2 changed files with 17 additions and 7 deletions

View File

@@ -1516,14 +1516,24 @@ namespace nana
path_type parent_path{ str };
str += (len + 1);
while(*str)
// if only one file was selected, the ofn.lpstrFile
// is returning only that file, without any parent
if (!*str)
{
len = ::wcslen(str);
targets.emplace_back(parent_path / path_type{str});
str += (len + 1);
targets.emplace_back(parent_path);
impl_->path = parent_path.parent_path().u8string();
}
else
{
while(*str)
{
len = ::wcslen(str);
targets.emplace_back(parent_path / path_type{str});
str += (len + 1);
}
impl_->path = parent_path.u8string();
}
impl_->path = parent_path.u8string();
}
else
{