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

If "detail" is empty then don't make message hilighted

Browse source
This commit is contained in:
Cheng Zhao 2015-07-08 14:41:19 +08:00
parent 49da74f976
commit f0be4025a5
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,9 +31,9 @@ int ShowMessageBoxUTF16(HWND parent,
for (size_t i = 0; i < buttons.size(); ++i)
dialog_buttons.push_back({i + kIDStart, buttons[i].c_str()});
TASKDIALOG_FLAGS flags = TDF_SIZE_TO_CONTENT;
TASKDIALOG_FLAGS flags = TDF_SIZE_TO_CONTENT; // show all content.
if (cancel_id != 0)
flags |= TDF_ALLOW_DIALOG_CANCELLATION;
flags |= TDF_ALLOW_DIALOG_CANCELLATION; // allow dialog to be cancelled.
TASKDIALOGCONFIG config = { 0 };
config.cbSize = sizeof(config);
@ -41,11 +41,17 @@ int ShowMessageBoxUTF16(HWND parent,
config.hInstance = GetModuleHandle(NULL);
config.dwFlags = flags;
config.pszWindowTitle = title.c_str();
config.pszMainInstruction = message.c_str();
config.pszContent = detail.c_str();
config.pButtons = &dialog_buttons.front();
config.cButtons = dialog_buttons.size();
// If "detail" is empty then don't make message hilighted.
if (detail.empty()) {
config.pszContent = message.c_str();
} else {
config.pszMainInstruction = message.c_str();
config.pszContent = detail.c_str();
}
int id = 0;
TaskDialogIndirect(&config, &id, NULL, NULL);
if (id == 0 || id == IDCANCEL)