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

Fix style issues of #4029

Browse source
This commit is contained in:
Cheng Zhao 2016-01-11 21:12:07 +08:00
parent edcd34d4ce
commit 26bd97d6cf
4 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ void ShowMessageBox(int type,
&callback)) { &callback)) {
atom::ShowMessageBox(window, (atom::MessageBoxType)type, buttons, atom::ShowMessageBox(window, (atom::MessageBoxType)type, buttons,
default_id, cancel_id, options, title, default_id, cancel_id, options, title,
message, detail, icon, callback); message, detail, icon, callback);
} else { } else {
int chosen = atom::ShowMessageBox(window, (atom::MessageBoxType)type, int chosen = atom::ShowMessageBox(window, (atom::MessageBoxType)type,
buttons, default_id, cancel_id, buttons, default_id, cancel_id,

16
atom/browser/ui/message_box_gtk.cc
View file

@ -61,16 +61,10 @@ class GtkMessageBox {
// Add buttons. // Add buttons.
for (size_t i = 0; i < buttons.size(); ++i) { for (size_t i = 0; i < buttons.size(); ++i) {
if (i == (size_t)default_id) { GtkWidget* button = gtk_dialog_add_button(
GtkWidget* button = gtk_dialog_add_button(GTK_DIALOG(dialog_), GTK_DIALOG(dialog_), TranslateToStock(i, buttons[i]), i);
TranslateToStock(i, buttons[i]), if (static_cast<int>(i) == default_id)
i);
gtk_widget_grab_focus(button); gtk_widget_grab_focus(button);
} else {
gtk_dialog_add_button(GTK_DIALOG(dialog_),
TranslateToStock(i, buttons[i]),
i);
}
} }
// Parent window. // Parent window.
@ -177,7 +171,7 @@ int ShowMessageBox(NativeWindow* parent,
const std::string& detail, const std::string& detail,
const gfx::ImageSkia& icon) { const gfx::ImageSkia& icon) {
return GtkMessageBox(parent, type, buttons, default_id, cancel_id, return GtkMessageBox(parent, type, buttons, default_id, cancel_id,
title, message, detail, icon).RunSynchronous(); title, message, detail, icon).RunSynchronous();
} }
void ShowMessageBox(NativeWindow* parent, void ShowMessageBox(NativeWindow* parent,
@ -192,7 +186,7 @@ void ShowMessageBox(NativeWindow* parent,
const gfx::ImageSkia& icon, const gfx::ImageSkia& icon,
const MessageBoxCallback& callback) { const MessageBoxCallback& callback) {
(new GtkMessageBox(parent, type, buttons, default_id, cancel_id, (new GtkMessageBox(parent, type, buttons, default_id, cancel_id,
title, message, detail, icon))->RunAsynchronous(callback); title, message, detail, icon))->RunAsynchronous(callback);
} }
void ShowErrorBox(const base::string16& title, const base::string16& content) { void ShowErrorBox(const base::string16& title, const base::string16& content) {

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

@ -79,17 +79,17 @@ NSAlert* CreateNSAlert(NativeWindow* parent_window,
// An empty title causes crash on OS X. // An empty title causes crash on OS X.
if (buttons[i].empty()) if (buttons[i].empty())
title = @"(empty)"; title = @"(empty)";
NSButton* button = [alert addButtonWithTitle:title]; NSButton* button = [alert addButtonWithTitle:title];
[button setTag:i]; [button setTag:i];
}
if (i == (size_t)default_id) { NSArray* ns_buttons = [alert buttons];
// Focus the button at default_id if the user opted to do so. if (default_id >= 0 && default_id < static_cast<int>([ns_buttons count])) {
// The first button added gets set as the default selected. // Focus the button at default_id if the user opted to do so.
// So remove that default, and make the requested button the default. // The first button added gets set as the default selected.
[[[alert buttons] objectAtIndex:0] setKeyEquivalent:@""]; // So remove that default, and make the requested button the default.
[button setKeyEquivalent:@"\r"]; [[ns_buttons objectAtIndex:0] setKeyEquivalent:@""];
} [[ns_buttons objectAtIndex:default_id] setKeyEquivalent:@"\r"];
} }
return alert; return alert;

18
atom/browser/ui/message_box_win.cc
View file

@ -84,11 +84,13 @@ int ShowMessageBoxUTF16(HWND parent,
TDF_ALLOW_DIALOG_CANCELLATION; // Allow canceling the dialog. TDF_ALLOW_DIALOG_CANCELLATION; // Allow canceling the dialog.
TASKDIALOGCONFIG config = { 0 }; TASKDIALOGCONFIG config = { 0 };
config.cbSize = sizeof(config); config.cbSize = sizeof(config);
config.hwndParent = parent; config.hwndParent = parent;
config.hInstance = GetModuleHandle(NULL); config.hInstance = GetModuleHandle(NULL);
config.dwFlags = flags; config.dwFlags = flags;
config.nDefaultButton = default_id ? (kIDStart + default_id) : 0;
if (default_id > 0)
config.nDefaultButton = kIDStart + default_id;
// TaskDialogIndirect doesn't allow empty name, if we set empty title it // TaskDialogIndirect doesn't allow empty name, if we set empty title it
// will show "electron.exe" in title. // will show "electron.exe" in title.
@ -230,13 +232,13 @@ void ShowMessageBox(NativeWindow* parent,
unretained->message_loop()->PostTask( unretained->message_loop()->PostTask(
FROM_HERE, FROM_HERE,
base::Bind(&RunMessageBoxInNewThread, base::Unretained(unretained), base::Bind(&RunMessageBoxInNewThread, base::Unretained(unretained),
parent, type, buttons, default_id, parent, type, buttons, default_id, cancel_id, options, title,
cancel_id, options, title, message, detail, icon, callback)); message, detail, icon, callback));
} }
void ShowErrorBox(const base::string16& title, const base::string16& content) { void ShowErrorBox(const base::string16& title, const base::string16& content) {
ShowMessageBoxUTF16(NULL, MESSAGE_BOX_TYPE_ERROR, {}, -1, 0, 0, L"Error", ShowMessageBoxUTF16(NULL, MESSAGE_BOX_TYPE_ERROR, {}, -1, 0, 0, L"Error",
title, content, gfx::ImageSkia()); title, content, gfx::ImageSkia());
} }
} // namespace atom } // namespace atom