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

mac: Make ShowOpenDialog able to be shown as sheet.

Browse source
This commit is contained in:
Cheng Zhao 2013-09-23 16:27:22 +08:00
parent 85d6588661
commit a4262bc39d
3 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
browser/api/atom_api_dialog.cc
View file

@ -124,7 +124,11 @@ v8::Handle<v8::Value> ShowOpenDialog(const v8::Arguments &args) {
int properties = args[2]->IntegerValue(); int properties = args[2]->IntegerValue();
std::vector<base::FilePath> paths; std::vector<base::FilePath> paths;
if (!file_dialog::ShowOpenDialog(title, default_path, properties, &paths)) if (!file_dialog::ShowOpenDialog(NULL,
title,
default_path,
properties,
&paths))
return v8::Undefined(); return v8::Undefined();
v8::Handle<v8::Array> result = v8::Array::New(paths.size()); v8::Handle<v8::Array> result = v8::Array::New(paths.size());

5
browser/ui/file_dialog.h
View file

@ -23,12 +23,13 @@ enum FileDialogProperty {
FILE_DIALOG_CREATE_DIRECTORY = 8, FILE_DIALOG_CREATE_DIRECTORY = 8,
}; };
bool ShowOpenDialog(const std::string& title, bool ShowOpenDialog(atom::NativeWindow* parent_window,
const std::string& title,
const base::FilePath& default_path, const base::FilePath& default_path,
int properties, int properties,
std::vector<base::FilePath>* paths); std::vector<base::FilePath>* paths);
bool ShowSaveDialog(atom::NativeWindow* window, bool ShowSaveDialog(atom::NativeWindow* parent_window,
const std::string& title, const std::string& title,
const base::FilePath& default_path, const base::FilePath& default_path,
base::FilePath* path); base::FilePath* path);

20
browser/ui/file_dialog_mac.mm
View file

@ -43,7 +43,8 @@ void SetupDialog(NSSavePanel* dialog,
} // namespace } // namespace
bool ShowOpenDialog(const std::string& title, bool ShowOpenDialog(atom::NativeWindow* parent_window,
const std::string& title,
const base::FilePath& default_path, const base::FilePath& default_path,
int properties, int properties,
std::vector<base::FilePath>* paths) { std::vector<base::FilePath>* paths) {
@ -60,7 +61,22 @@ bool ShowOpenDialog(const std::string& title,
if (properties & FILE_DIALOG_MULTI_SELECTIONS) if (properties & FILE_DIALOG_MULTI_SELECTIONS)
[dialog setAllowsMultipleSelection:YES]; [dialog setAllowsMultipleSelection:YES];
if ([dialog runModal] == NSFileHandlingPanelCancelButton) __block int chosen = -1;
if (parent_window == NULL) {
chosen = [dialog runModal];
} else {
NSWindow* window = parent_window->GetNativeWindow();
[dialog beginSheetModalForWindow:window
completionHandler:^(NSInteger c) {
chosen = c;
[NSApp stopModal];
}];
[NSApp runModalForWindow:window];
}
if (chosen == NSFileHandlingPanelCancelButton)
return false; return false;
NSArray* urls = [dialog URLs]; NSArray* urls = [dialog URLs];