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

Support explicit cancelId on macOS

Browse source
This commit is contained in:
Kevin Sawicki 2017-02-22 10:05:16 -08:00
parent d01250eceb
commit be16e75be2
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
atom/browser/ui/message_box_mac.mm
View file

@ -57,6 +57,7 @@ NSAlert* CreateNSAlert(NativeWindow* parent_window,
MessageBoxType type,
const std::vector<std::string>& buttons,
int default_id,
int cancel_id,
const std::string& title,
const std::string& message,
const std::string& detail,
@ -89,7 +90,14 @@ NSAlert* CreateNSAlert(NativeWindow* parent_window,
}
NSArray* ns_buttons = [alert buttons];
if (default_id >= 0 && default_id < static_cast<int>([ns_buttons count])) {
int button_count = static_cast<int>([ns_buttons count]);
// Bind cancel id button to escape key if there is more than one button
if (button_count > 1 && cancel_id >= 0 && cancel_id < button_count) {
[[ns_buttons objectAtIndex:cancel_id] setKeyEquivalent:@"\e"];
}
if (default_id >= 0 && default_id < button_count) {
// Focus the button at default_id if the user opted to do so.
// The first button added gets set as the default selected.
// So remove that default, and make the requested button the default.
@ -129,7 +137,8 @@ int ShowMessageBox(NativeWindow* parent_window,
const std::string& detail,
const gfx::ImageSkia& icon) {
NSAlert* alert = CreateNSAlert(parent_window, type, buttons, default_id,
title, message, detail, "", false, icon);
cancel_id, title, message, detail, "", false,
icon);
// Use runModal for synchronous alert without parent, since we don't have a
// window to wait for.
@ -166,8 +175,8 @@ void ShowMessageBox(NativeWindow* parent_window,
const gfx::ImageSkia& icon,
const MessageBoxCallback& callback) {
NSAlert* alert =
CreateNSAlert(parent_window, type, buttons, default_id, title, message,
detail, checkbox_label, checkbox_checked, icon);
CreateNSAlert(parent_window, type, buttons, default_id, cancel_id, title,
message, detail, checkbox_label, checkbox_checked, icon);
ModalDelegate* delegate = [[ModalDelegate alloc] initWithCallback:callback
andAlert:alert
callEndModal:false];