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

Merge pull request #4029 from leethomas/show-message-box-default-button

Browse source 
Show message box default button
This commit is contained in:
Cheng Zhao 2016-01-11 20:58:03 +08:00
commit edcd34d4ce
7 changed files with 60 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/api/atom_api_dialog.cc
View file

@ -41,6 +41,7 @@ namespace {
void ShowMessageBox(int type,
const std::vector<std::string>& buttons,
int default_id,
int cancel_id,
int options,
const std::string& title,
@ -54,12 +55,13 @@ void ShowMessageBox(int type,
if (mate::Converter<atom::MessageBoxCallback>::FromV8(args->isolate(),
peek,
&callback)) {
atom::ShowMessageBox(window, (atom::MessageBoxType)type, buttons, cancel_id,
options, title, message, detail, icon, callback);
atom::ShowMessageBox(window, (atom::MessageBoxType)type, buttons,
default_id, cancel_id, options, title,
message, detail, icon, callback);
} else {
int chosen = atom::ShowMessageBox(window, (atom::MessageBoxType)type,
buttons, cancel_id, options, title,
message, detail, icon);
buttons, default_id, cancel_id,
options, title, message, detail, icon);
args->Return(chosen);
}
}

2
atom/browser/api/lib/dialog.coffee
View file

@ -95,6 +95,7 @@ module.exports =
options.message ?= ''
options.detail ?= ''
options.icon ?= null
options.defaultId ?= -1
# Choose a default button to get selected when dialog is cancelled.
unless options.cancelId?
@ -108,6 +109,7 @@ module.exports =
binding.showMessageBox messageBoxType,
options.buttons,
options.defaultId,
options.cancelId,
flags,
options.title,