mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #3240 from atom/reland-win-remove-wildcard-extension

Browse source 
Reland win remove wildcard extension
This commit is contained in:
Cheng Zhao 2015-10-27 20:52:43 +08:00
commit c9b53a6e8b
1 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

24
atom/browser/ui/file_dialog_win.cc
View file

@ -79,8 +79,25 @@ class FileDialog {
if (!title.empty()) if (!title.empty())
GetPtr()->SetTitle(base::UTF8ToUTF16(title).c_str()); GetPtr()->SetTitle(base::UTF8ToUTF16(title).c_str());
if (!filterspec.empty()) // By default, *.* will be added to the file name if file type is "*.*". In
GetPtr()->SetDefaultExtension(filterspec.front().pszSpec); // Electron, we disable it to make a better experience.
//
// From MSDN: https://msdn.microsoft.com/en-us/library/windows/desktop/
// bb775970(v=vs.85).aspx
//
// If SetDefaultExtension is not called, the dialog will not update
// automatically when user choose a new file type in the file dialog.
//
// We set file extension to the first none-wildcard extension to make
// sure the dialog will update file extension automatically.
for (size_t i = 0; i < filterspec.size(); ++i) {
if (std::wstring(filterspec[i].pszSpec) != L"*.*") {
// SetFileTypeIndex is regarded as one-based index.
GetPtr()->SetFileTypeIndex(i+1);
GetPtr()->SetDefaultExtension(filterspec[i].pszSpec);
break;
}
}
SetDefaultFolder(default_path); SetDefaultFolder(default_path);
} }
@ -255,7 +272,8 @@ bool ShowSaveDialog(atom::NativeWindow* parent_window,
bool matched = false; bool matched = false;
for (size_t i = 0; i < filter.second.size(); ++i) { for (size_t i = 0; i < filter.second.size(); ++i) {
if (base::EndsWith(file_name, filter.second[i], false)) { if (filter.second[i] == "*" ||
base::EndsWith(file_name, filter.second[i], false)) {
matched = true; matched = true;
break;; break;;
} }