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

Allow showing message dialog as sheet.

Browse source
This commit is contained in:
Cheng Zhao 2013-06-07 15:59:12 +08:00
parent a897d5b715
commit dfbbaa9efb
4 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
browser/api/atom_api_dialog.cc
View file

@ -49,6 +49,15 @@ v8::Handle<v8::Value> ShowMessageBox(const v8::Arguments &args) {
!args[4]->IsString()) // detail
return node::ThrowTypeError("Bad argument");
NativeWindow* native_window = NULL;
if (args[5]->IsObject()) {
Window* window = Window::Unwrap<Window>(args[5]->ToObject());
if (!window || !window->window())
return node::ThrowError("Invalid window");
native_window = window->window();
}
MessageBoxType type = (MessageBoxType)(args[0]->IntegerValue());
std::vector<std::string> buttons;
@ -60,7 +69,8 @@ v8::Handle<v8::Value> ShowMessageBox(const v8::Arguments &args) {
std::string message(*v8::String::Utf8Value(args[3]));
std::string detail(*v8::String::Utf8Value(args[4]));
int chosen = atom::ShowMessageBox(type, buttons, title, message, detail);
int chosen = atom::ShowMessageBox(
native_window, type, buttons, title, message, detail);
return scope.Close(v8::Integer::New(chosen));
}

12
browser/api/lib/dialog.coffee
View file

@ -30,7 +30,11 @@ module.exports =
binding.showSaveDialog window, options.title, options.defaultPath
showMessageBox: (options) ->
showMessageBox: (window, options) ->
if window?.constructor isnt BrowserWindow
options = window
window = null
options = type: 'none' unless options?
options.type = options.type ? 'none'
options.type = messageBoxTypes.indexOf options.type
@ -42,7 +46,9 @@ module.exports =
options.message = options.message ? ''
options.detail = options.detail ? ''
binding.showMessageBox options.type, options.buttons,
binding.showMessageBox options.type,
options.buttons,
String(options.title),
String(options.message),
String(options.detail)
String(options.detail),
window