diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-09-29 13:33:25 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-09-29 13:33:25 +0000 |
| commit | 98f090a525e33973738e4105b6e8257ab34ff6eb (patch) | |
| tree | 6aecfaef0cc0d24eab8134fb690f92df10d8668b /plugins/Toaster/src/toast_notification.cpp | |
| parent | 8235db586d12c56b18ebf4d1279c873b4fe7cac7 (diff) | |
Toaster: code optimization
git-svn-id: http://svn.miranda-ng.org/main/trunk@15471 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Toaster/src/toast_notification.cpp')
| -rw-r--r-- | plugins/Toaster/src/toast_notification.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/plugins/Toaster/src/toast_notification.cpp b/plugins/Toaster/src/toast_notification.cpp index 0275920c64..1db63634ec 100644 --- a/plugins/Toaster/src/toast_notification.cpp +++ b/plugins/Toaster/src/toast_notification.cpp @@ -8,9 +8,6 @@ ToastNotification::ToastNotification(_In_ wchar_t* text, _In_ wchar_t* caption, ToastNotification::~ToastNotification()
{
- notification->remove_Activated(_ertActivated);
- notification->remove_Dismissed(_ertDismissed);
- notification->remove_Failed(_ertFailed);
}
HRESULT ToastNotification::Initialize()
@@ -26,6 +23,7 @@ HRESULT ToastNotification::CreateXml(_Outptr_ ABI::Windows::Data::Xml::Dom::IXml CHECKHR(Windows::Foundation::ActivateInstance(StringReferenceWrapper(RuntimeClass_Windows_Data_Xml_Dom_XmlDocument).Get(), &xmlDocument));
HXML xmlToast = xmlCreateNode(L"toast", NULL, 0);
+ xmlAddAttr(xmlToast, L"activationType", L"foreground");
HXML xmlAudioNode = xmlAddChild(xmlToast, L"audio", NULL);
xmlAddAttr(xmlAudioNode, L"silent", L"true");
@@ -33,14 +31,10 @@ HRESULT ToastNotification::CreateXml(_Outptr_ ABI::Windows::Data::Xml::Dom::IXml HXML xmlVisualNode = xmlAddChild(xmlToast, L"visual", NULL);
HXML xmlBindingNode = xmlAddChild(xmlVisualNode, L"binding", NULL);
- xmlAddAttr(xmlBindingNode, L"template", IsWinVer10Plus() ? L"ToastGeneric" : L"ToastImageAndText02");
+ xmlAddAttr(xmlBindingNode, L"template", L"ToastImageAndText02");
if (_imagePath)
{
HXML xmlImageNode = xmlAddChild(xmlBindingNode, L"image", NULL);
-
- if (IsWinVer10Plus())
- xmlAddAttr(xmlImageNode, L"placement", L"appLogoOverride");
-
xmlAddAttr(xmlImageNode, L"id", L"1");
xmlAddAttr(xmlImageNode, L"src", CMString(FORMAT, L"file:///%s", _imagePath));
}
@@ -73,9 +67,9 @@ HRESULT ToastNotification::Create(_Outptr_ ABI::Windows::UI::Notifications::IToa return factory->CreateToastNotification(xml.Get(), _notification);
}
-HRESULT ToastNotification::Show(_In_ ToastEventHandler* handler)
+HRESULT ToastNotification::Show(_In_ ToastHandlerData* thd)
{
- ComPtr<ToastEventHandler> eventHandler(handler);
+ ComPtr<ToastEventHandler> eventHandler(new ToastEventHandler(thd));
CHECKHR(notification->add_Activated(eventHandler.Get(), &_ertActivated));
CHECKHR(notification->add_Dismissed(eventHandler.Get(), &_ertDismissed));
|