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

Support Windows 7 notifications from brightray

Browse source
This commit is contained in:
Samuel Attard 2017-04-24 09:47:18 +10:00
parent a4bd26fab0
commit 6bbc4c3113
No known key found for this signature in database
GPG key ID: 273DC1869D8F13EF
5 changed files with 85 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

41
atom/browser/api/atom_api_notification_win.cc
View file

@ -4,10 +4,16 @@
#include "atom/browser/api/atom_api_notification.h"
#include "atom/browser/ui/notification_delegate_adapter.h"
#include "atom/browser/ui/win/toast_handler.h"
#include "atom/browser/ui/win/toast_lib.h"
#include "base/strings/utf_string_conversions.h"
#include "browser/notification.h"
#include "browser/notification_presenter.h"
#include "browser/win/notification_presenter_win7.h"
#include "common/string_conversion.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "url/gurl.h"
namespace atom {
@ -15,18 +21,33 @@ namespace api {
bool can_toast_ = true;
bool initialized_ = false;
brightray::NotificationPresenter* presenter;
void Notification::Show() {
atom::AtomToastHandler* handler = new atom::AtomToastHandler(this);
WinToastLib::WinToastTemplate toast = WinToastLib::WinToastTemplate(WinToastLib::WinToastTemplate::TextTwoLines);
// toast.setImagePath(L"C:\example.png");
toast.setTextField(title_, WinToastLib::WinToastTemplate::TextField::FirstLine);
toast.setTextField(body_, WinToastLib::WinToastTemplate::TextField::SecondLine);
toast.setSilent(silent_);
if (can_toast_) {
atom::AtomToastHandler* handler = new atom::AtomToastHandler(this);
WinToastLib::WinToastTemplate toast = WinToastLib::WinToastTemplate(WinToastLib::WinToastTemplate::TextTwoLines);
// toast.setImagePath(L"C:\example.png");
toast.setTextField(title_, WinToastLib::WinToastTemplate::TextField::FirstLine);
toast.setTextField(body_, WinToastLib::WinToastTemplate::TextField::SecondLine);
toast.setSilent(silent_);
WinToastLib::WinToast::instance()->showToast(toast, handler);
WinToastLib::WinToast::instance()->showToast(toast, handler);
OnShown();
OnShown();
} else {
AtomNotificationDelegateAdapter* adapter = new AtomNotificationDelegateAdapter(this);
auto notif = presenter->CreateNotification(adapter);
GURL* u = new GURL;
notif->Show(
title_,
body_,
"",
u->Resolve(""),
*(new SkBitmap),
true
);
}
}
void Notification::OnInitialProps() {
@ -37,6 +58,10 @@ void Notification::OnInitialProps() {
);
can_toast_ = WinToastLib::WinToast::instance()->initialize();
}
can_toast_ = false;
if (!can_toast_) {
presenter = new brightray::NotificationPresenterWin7;
}
}
void Notification::NotifyPropsUpdated() {