From 50033d9aa3c36248b4a58243f9f9be0eaa6a1355 Mon Sep 17 00:00:00 2001 From: Daniel Clark Date: Sun, 14 Feb 2021 20:59:45 +0000 Subject: [PATCH] Added notification icon fallback support --- .../NotificationFlyoutSample.Host.csproj | 1 + .../NotificationFlyoutSample.csproj | 8 ++-- samples/NotificationFlyoutSample/Shell.xaml | 4 +- .../NotificationFlyoutSample/Shell.xaml.cs | 4 +- ...amlGuy.NotificationFlyout.Shared.UI.csproj | 5 +++ .../NotificationFlyoutHost.cs | 11 +---- .../Assets/notification-icon-default.ico | Bin 0 -> 101207 bytes .../Assets/notification-icon-light.ico | Bin 0 -> 101172 bytes .../NotificationFlyoutXamlHost.cs | 39 ++++++++---------- ....NotificationFlyout.Wpf.UI.Controls.csproj | 10 +++++ .../XamlHost/XamlHost.cs | 1 + .../Extensions/ImageSourceExtensions.cs | 31 ++++++++++++++ .../NativeMethods.txt | 1 + ...heXamlGuy.NotificationFlyout.Wpf.UI.csproj | 7 ++++ 14 files changed, 80 insertions(+), 42 deletions(-) create mode 100644 src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/Assets/notification-icon-default.ico create mode 100644 src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/Assets/notification-icon-light.ico create mode 100644 src/TheXamlGuy.NotificationFlyout.Wpf.UI/Extensions/ImageSourceExtensions.cs create mode 100644 src/TheXamlGuy.NotificationFlyout.Wpf.UI/NativeMethods.txt diff --git a/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj b/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj index 0dc79d1..0b69427 100644 --- a/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj +++ b/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj @@ -6,6 +6,7 @@ true AnyCPU;x64 NotificationFlyoutSample.Host.Program + uap10.0.19041 diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj index 4d99e11..76ef38b 100644 --- a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj +++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj @@ -172,14 +172,14 @@ - - {7d6a151b-c021-4d34-adc1-0171a2f65a00} - TheXamlGuy.NotificationFlyout.Shared.UI - {8501316d-f994-4a29-9ec4-dc6c6b93f565} TheXamlGuy.NotificationFlyout.Uwp.UI.Controls + + {8501316d-f994-4a29-9ec4-dc6c6b93f565} + TheXamlGuy.NotificationFlyout.Shared.UI + 14.0 diff --git a/samples/NotificationFlyoutSample/Shell.xaml b/samples/NotificationFlyoutSample/Shell.xaml index fcace13..f386b57 100644 --- a/samples/NotificationFlyoutSample/Shell.xaml +++ b/samples/NotificationFlyoutSample/Shell.xaml @@ -3,9 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:TheXamlGuy.NotificationFlyout.Uwp.UI.Controls" - xmlns:muxc="using:Microsoft.UI.Xaml.Controls" - IconSource="/Assets/Icon.ico" - LightIconSource="/Assets/Icon-Light.ico"> + xmlns:muxc="using:Microsoft.UI.Xaml.Controls">