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

Merge branch 'mihaizh-fix_filebox_multi_select' into hotfix-1.7.2

Browse Source
This commit is contained in:
Jinhao 2019-09-02 05:41:39 +08:00
commit e6b0332bad
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -44,7 +44,7 @@ matrix:
before_install: before_install:
- cd .. - cd ..
- git clone --depth=1 --branch=develop https://github.com/qPCR4vir/nana-demo.git nana-demo - git clone --depth=1 --branch=master https://github.com/qPCR4vir/nana-demo.git nana-demo
- export PATH="$HOME/bin:$PATH" - export PATH="$HOME/bin:$PATH"
- wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.12/cmake-3.12.0-rc3-Linux-x86_64.sh || true - wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.12/cmake-3.12.0-rc3-Linux-x86_64.sh || true
- chmod -R +x /tmp/tools - chmod -R +x /tmp/tools

22
source/gui/filebox.cpp
View File

@ -1516,14 +1516,24 @@ namespace nana
path_type parent_path{ str }; path_type parent_path{ str };
str += (len + 1); 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);
targets.emplace_back(parent_path / path_type{str}); impl_->path = parent_path.parent_path().u8string();
str += (len + 1); }
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 else
{ {