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

Show user's icon when specified

Browse source
This commit is contained in:
Cheng Zhao 2015-07-08 15:04:34 +08:00
parent 6fb8b2ce4f
commit 989351a41d
1 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,9 @@
#include "base/callback.h" #include "base/callback.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/threading/thread.h" #include "base/threading/thread.h"
#include "base/win/scoped_gdi_object.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "ui/gfx/icon_util.h"
namespace atom { namespace atom {
@ -27,7 +29,8 @@ int ShowMessageBoxUTF16(HWND parent,
int cancel_id, int cancel_id,
const base::string16& title, const base::string16& title,
const base::string16& message, const base::string16& message,
const base::string16& detail) { const base::string16& detail,
const gfx::ImageSkia& icon) {
std::vector<TASKDIALOG_BUTTON> dialog_buttons; std::vector<TASKDIALOG_BUTTON> dialog_buttons;
for (size_t i = 0; i < buttons.size(); ++i) for (size_t i = 0; i < buttons.size(); ++i)
dialog_buttons.push_back({i + kIDStart, buttons[i].c_str()}); dialog_buttons.push_back({i + kIDStart, buttons[i].c_str()});
@ -45,17 +48,24 @@ int ShowMessageBoxUTF16(HWND parent,
config.pButtons = &dialog_buttons.front(); config.pButtons = &dialog_buttons.front();
config.cButtons = dialog_buttons.size(); config.cButtons = dialog_buttons.size();
// Show icon according to dialog's type. base::win::ScopedHICON hicon;
switch (type) { if (!icon.isNull()) {
case MESSAGE_BOX_TYPE_INFORMATION: hicon.Set(IconUtil::CreateHICONFromSkBitmap(*icon.bitmap()));
config.pszMainIcon = TD_INFORMATION_ICON; config.dwFlags |= TDF_USE_HICON_MAIN;
break; config.hMainIcon = hicon.Get();
case MESSAGE_BOX_TYPE_WARNING: } else {
config.pszMainIcon = TD_WARNING_ICON; // Show icon according to dialog's type.
break; switch (type) {
case MESSAGE_BOX_TYPE_ERROR: case MESSAGE_BOX_TYPE_INFORMATION:
config.pszMainIcon = TD_ERROR_ICON; config.pszMainIcon = TD_INFORMATION_ICON;
break; break;
case MESSAGE_BOX_TYPE_WARNING:
config.pszMainIcon = TD_WARNING_ICON;
break;
case MESSAGE_BOX_TYPE_ERROR:
config.pszMainIcon = TD_ERROR_ICON;
break;
}
} }
// If "detail" is empty then don't make message hilighted. // If "detail" is empty then don't make message hilighted.
@ -117,7 +127,8 @@ int ShowMessageBox(NativeWindow* parent,
cancel_id, cancel_id,
base::UTF8ToUTF16(title), base::UTF8ToUTF16(title),
base::UTF8ToUTF16(message), base::UTF8ToUTF16(message),
base::UTF8ToUTF16(detail)); base::UTF8ToUTF16(detail),
icon);
} }
void ShowMessageBox(NativeWindow* parent, void ShowMessageBox(NativeWindow* parent,