From 91b4f94e3f441ff85c2a557ca9803e691fd05fb7 Mon Sep 17 00:00:00 2001
From: Daniel Clark <dan@thexamlguy.com>
Date: Wed, 10 Feb 2021 22:44:19 +0000
Subject: [PATCH] [WIP] Add context menu support

---
 .../NotificationFlyoutSample.Host.csproj      |   1 +
 samples/NotificationFlyoutSample.sln          |  22 +++++
 .../NotificationFlyoutSample.Host/Program.cs  |   8 +-
 .../SampleNotificationFlyout.xaml             |   9 --
 .../SampleNotificationFlyout.xaml.cs          |  10 ---
 .../NotificationFlyoutSample.sln              |   2 +-
 .../Assets/Icon-Light.ico                     | Bin 0 -> 18686 bytes
 .../NotificationFlyoutSample/Assets/Icon.ico  | Bin 0 -> 18686 bytes
 .../NotificationFlyoutSample.csproj           |   2 +
 .../NotificationFlyoutSample/Shell.xaml       |  83 ++++++++++++++++--
 .../NotificationFlyoutSample/Shell.xaml.cs    |  39 ++++----
 samples/NotificationFlyoutSample/Shell.xaml   |   3 +
 .../NotificationFlyout.Uwp.UI.Controls.csproj |   7 ++
 .../ContextMenuFlyoutHost.cs                  |  34 +++++++
 .../ContextMenuFlyoutHost.xaml                |  20 +++++
 .../NotificationFlyout/NotificationFlyout.cs  |  22 ++++-
 .../NotificationFlyoutHost.cs                 |   2 +-
 .../Themes/Generic.xaml                       |   1 +
 ...tionFlyout - Backup.Wpf.UI.Controls.csproj |  25 ++++++
 .../NotificationFlyoutApplication.cs          |   4 +-
 .../NotificationFlyoutContextMenuXamlHost.cs  |  38 ++++++++
 .../NotificationFlyoutXamlHost.cs             |  75 ++++++----------
 .../NotificationFlyout/XamlHostWindow.cs      |  60 +++++++++++++
 .../Helpers/CursorHelper.cs                   |  13 +++
 .../Helpers/WindowHelper.cs                   |   4 +-
 .../NativeMethods.txt                         |   8 +-
 .../Properties/AssemblyInfo.cs                |   3 +
 src/NotificationFlyout.Wpf.UI/Screen.cs       |   1 +
 src/NotificationFlyout.sln                    |   2 +-
 29 files changed, 391 insertions(+), 107 deletions(-)
 delete mode 100644 samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml
 delete mode 100644 samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml.cs
 create mode 100644 samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Icon-Light.ico
 create mode 100644 samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Icon.ico
 create mode 100644 src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/ContextMenuFlyoutHost.cs
 create mode 100644 src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/ContextMenuFlyoutHost.xaml
 create mode 100644 src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout - Backup.Wpf.UI.Controls.csproj
 create mode 100644 src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs
 create mode 100644 src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/XamlHostWindow.cs
 create mode 100644 src/NotificationFlyout.Wpf.UI/Helpers/CursorHelper.cs
 create mode 100644 src/NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs

diff --git a/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj b/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj
index ce80946..aeab0b6 100644
--- a/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj
+++ b/samples/NotificationFlyoutSample.Host/NotificationFlyoutSample.Host.csproj
@@ -20,6 +20,7 @@
     <ProjectReference Include="..\..\src\NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj" />
     <ProjectReference Include="..\..\src\NotificationFlyout.Wpf.UI.Controls\NotificationFlyout.Wpf.UI.Controls.csproj" />
     <ProjectReference Include="..\..\src\NotificationFlyout.Wpf.UI\NotificationFlyout.Wpf.UI.csproj" />
+    <ProjectReference Include="..\NotificationFlyout.Shared.UI\NotificationFlyout.Shared.UI.csproj" />
     <ProjectReference Include="..\NotificationFlyoutSample\NotificationFlyoutSample.csproj" />
   </ItemGroup>
   
diff --git a/samples/NotificationFlyoutSample.sln b/samples/NotificationFlyoutSample.sln
index 9079ea8..901c113 100644
--- a/samples/NotificationFlyoutSample.sln
+++ b/samples/NotificationFlyoutSample.sln
@@ -22,6 +22,8 @@ Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "NotificationFlyoutSample.Pa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyout.Uwp.UI", "..\src\NotificationFlyout.Uwp.UI\NotificationFlyout.Uwp.UI.csproj", "{AFCE4980-A641-4BBB-A745-F0D4E54A0D86}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationFlyout.Shared.UI", "NotificationFlyout.Shared.UI\NotificationFlyout.Shared.UI.csproj", "{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -193,6 +195,26 @@ Global
 		{AFCE4980-A641-4BBB-A745-F0D4E54A0D86}.Release|x64.Build.0 = Release|x64
 		{AFCE4980-A641-4BBB-A745-F0D4E54A0D86}.Release|x86.ActiveCfg = Release|Any CPU
 		{AFCE4980-A641-4BBB-A745-F0D4E54A0D86}.Release|x86.Build.0 = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|x64.Build.0 = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Debug|x86.Build.0 = Debug|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|ARM.Build.0 = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|ARM64.Build.0 = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|x64.ActiveCfg = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|x64.Build.0 = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|x86.ActiveCfg = Release|Any CPU
+		{6D11191A-6A61-4A93-BEBB-EC34FE9FA403}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Program.cs b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Program.cs
index 2e523ad..34671c4 100644
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Program.cs
+++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/Program.cs
@@ -1,4 +1,5 @@
-using System;
+using NotificationFlyout.Wpf.UI.Controls;
+using System;
 
 namespace NotificationFlyoutSample.Host
 {
@@ -10,7 +11,10 @@ namespace NotificationFlyoutSample.Host
             using (new NotificationFlyoutSample.App())
             {
                 var app = new App();
-                new SampleNotificationFlyout();
+                new NotificationFlyoutApplication
+                {
+                    Flyout = new Shell()
+                };
                 app.Run();
             }
         }
diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml
deleted file mode 100644
index 6d456f7..0000000
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<NotificationFlyout
-    x:Class="NotificationFlyoutSample.Host.SampleNotificationFlyout"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:uwp="clr-namespace:NotificationFlyoutSample;assembly=NotificationFlyoutSample"
-    IconSource="/Assets/Icon.ico"
-    LightIconSource="/Assets/Icon-Light.ico">
-    <uwp:Shell />
-</NotificationFlyout>
diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml.cs b/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml.cs
deleted file mode 100644
index d2795ec..0000000
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample.Host/SampleNotificationFlyout.xaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace NotificationFlyoutSample.Host
-{
-    public partial class SampleNotificationFlyout
-    {
-        public SampleNotificationFlyout()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.sln b/samples/NotificationFlyoutSample/NotificationFlyoutSample.sln
index 5940889..cf09d7a 100644
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample.sln
+++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30914.41
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationFlyoutSample.Host", "NotificationFlyoutSample.Host\NotificationFlyoutSample.Host.csproj", "{D13742AD-DB71-4269-B3AF-7CA8C4E51A19}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyoutSample.Host", "NotificationFlyoutSample.Host\NotificationFlyoutSample.Host.csproj", "{D13742AD-DB71-4269-B3AF-7CA8C4E51A19}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationFlyoutSample", "NotificationFlyoutSample\NotificationFlyoutSample.csproj", "{2057ADE0-C61E-45EE-BB7E-A469FE4D4C41}"
 EndProject
diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Icon-Light.ico b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Icon-Light.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5c7e7a84841b691da0a36d103f3a3c3b001931af
GIT binary patch
literal 18686
zcmeI4SBP9y7=UlYf}$oM!eZSA1q<rpgIG{U5FbQTY^W%%h+@NT>^i8#JcuZYVomId
zrr59`vBZJ}5xYJZ+k+TQG?G~3`hD5?<8_$3J7@On?rhi}KF*o{{_UPQ_uO;uEL#*)
zigk)<(+b+&;?%W^;;5o1dU^&w&s@JK7NG0x9sK+Vb_Z-+6n%Y-&)XKolC6sW`QN&K
zQEW#HOo=#XM^hBUS%|Nc<TCopU?7p@*q;TzLZ`A4NAq?nsWn&Gk2HTS|K|E4?r{2c
z?IKRIee>rkyDEM7r?yq`QuUEH{Gx4F->zL%-0)9ro8xuje=$y-T)!*uyTF83{WD0p
zf8vay2s|Er+p@ju3`<qPa<ppwGDg9g)nc8wgd@+uZ$QN4^(Mxu-2OqFd2l8e`wqAg
zu7+zz$Tj$11;%^|es6rH$tvcFbF!aX9EXVi2K||EU8A+%DG|e%5q~lLPcmc7h<`i%
z9UJUKI}##}F(bZXm0QZ=Uyi>iiK2#bt3IS1o2vMy6C}Qik4k;@A??^y#jg`2#;x3{
z52@2BAB(>FkTo^_UYy`X;QCx{)rYiWQ#C%$jqO{|Jb#9>sfvFZv7I;aL8-4kq#c{8
z_;rHBd?>f-L+W(O$D*%3WKE4<;{@w1P#;pGQ*VL#kgD;C<0EayD*g);dKcupzt<Zv
zpQD`)-sf}fPyTGgJdbvj>^tyxA!YG%U(bd~G{<ot)(bW8IdYZo0N7$5c0R{$h0h?@
zJ}j=ws`gWIT@NRNxo5$AcoANKg`>o)#9aX9avygCd=5{*Nw6pE4Yg6i*sk%O_tWqt
zI7ZgAFN~GcNaPsD_v5&z8!M@isGQ&X$+_V8I1c-b62>-%xy%{ozl{FJ;NJDkQN|qR
zGH18sAMf#ZF4SPGq(-9h{Oh*-Q>kwkaK7%-ggTFD6Ow9Q!*QtdH~!7wTzw5(lf}L|
zk7*N<YG1=~sQjL@`QrL$Zat<=NUD7e$I1Nvjc@b(PaV%x`{BlaXTF~s!TZw7u%Ll`
zbsp0uB-Or#<51uKMjYP(_JG}+Q0FmiLQ?H(ICgXX)bUKUAMX59=ToZvWd5P&U+Q?K
z+7CDWsrQpq`{D9WEynl$OZrij8qtSZe?~Pq!OQu-;q$ZLGtpQ*f1T3E`8DlrFbl@&
z`ST@mJqh=~EpQIFpBl^O?=Q%A6Py97W$S@~-(|I;(FuLelzPudh&bi=zNhGeepvmU
zVjCvs#)F^^Ih)QEFdN>770|pd?3T~IGkO=CTYkU&VD0|4G8^2(EP}<b1eU_j<BT=P
zPvCX&GWc7Fb^E+L8}5bs-~o6D9)-tY9?WmF_Q#7k<bDhu0c)HEcY^PFoHMR@>Mw<3
z;1D<rj_MMu<xn^lE(gc>b@&jxF290@!P+;2bzyzrYUv8B#hNyU<G}CZdx-1uNBYi}
zBf*-xRjkc9;XL-bjQW?-p9>zFi1m9ePr(VW1$68Dv9^Bj9qBI+<G-B#JK(+RL^vFd
zfTOzvYq2J4vqo#R=BWQK`d$z3!SmpEA<uLPQIEA*qqSOd)W4Fx_g$~!@4&sAeA^{N
zJ=SK8)@sdB|3n}Ei9Y|mmc6F?VIr<SuAkl$Ci42fCe}ZN?_?d=0DKoW6}&&U!eiQK
ztB<}Rx#F1DIpSEC_YYO`$2#0I?G6XSk>I_={a_h&9@9o!ee?~<6(_ZR$I^N(g!|!1
zcmmx2l~Lz0ZM4-#-;i8!QtNj<IHuP1E&KuAJ6x~IsPmXM+UlckNUk`k^=t1uajdO3
z?srwKHrnc=Z%EEKDf2&P-dy7_S%39Bnw&p_V>8q^q|BdO>qf3PUXLmD``o`9oD06!
z^cmmxFutoOqt0X6XseIDA-UqD*1t9d^uVrg036idK-w~)*G5}?^bN@sC$;{yD8RAX
z1l$vB*}y$^nb2#atv>pO<cgD8f39)M6(_a+T=O<poYeYrtsA-Gq}H!}uKRwjI4SGr
zWc`CHP|k6f9RG>4f6KLQ<cgEJ{^WXY%@rrL{#@@3a>YrlKi7MkTyawCkNsD-v}<bp
zKQO>^;dtow-%qX4TCLglIG@4W@F-jX$G{=re#LuTH()J?g1=u|qqV*TpTK<$d~fz3
z_+035p9g(UI=|7{A1~&R+h<hkdI+p}Hq3&{U`C_=D(xaz3`<}s_-?lwu%2&VA^4nq
zHCzN|z@>0Eyay|w>iyt&>;3x~YrGSt!zs{~tT%vsRTR;-<<!C`{G(mBm{KqL{lR=<
zw{bqvwm9{cs_oEDgI-wucUnAcxA;3PuajkvI)|3ya~Avxoytla&D*J@)?8&j()_vn
zo9m0X!|B_#i#W~p&7Z66s`TNX+E&F&)kog&i?&^TyLMG^!#}lcj@OC*#W;0x{dzyS
Tz=Y-h2NHe%Pe?G-{}1^W(9))m

literal 0
HcmV?d00001

diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Icon.ico b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Assets/Icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6375e26931544ca707fde9eb7e856f023e443b2f
GIT binary patch
literal 18686
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

literal 0
HcmV?d00001

diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample/NotificationFlyoutSample.csproj b/samples/NotificationFlyoutSample/NotificationFlyoutSample/NotificationFlyoutSample.csproj
index ba35c2f..8d12e4a 100644
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample/NotificationFlyoutSample.csproj
+++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/NotificationFlyoutSample.csproj
@@ -130,6 +130,8 @@
     </AppxManifest>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Assets\Icon-Light.ico" />
+    <Content Include="Assets\Icon.ico" />
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml
index 4168d62..a6e1b16 100644
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml
+++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml
@@ -1,16 +1,83 @@
-<UserControl
+<controls:NotificationFlyout
     x:Class="NotificationFlyoutSample.Shell"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:winui="using:Microsoft.UI.Xaml.Controls">
-    <StackPanel
-        Width="330"
-        Height="500"
-        Margin="24">
+    xmlns:controls="using:NotificationFlyout.Uwp.UI.Controls"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    IconSource="/Assets/Icon.ico"
+    LightIconSource="/Assets/Icon-Light.ico">
+    <StackPanel Margin="24">
+        <ComboBox
+            x:Name="Theme"
+            Margin="0,0,0,8"
+            SelectionChanged="Theme_SelectionChanged">
+            <ComboBoxItem Content="Default" />
+            <ComboBoxItem Content="Dark" />
+            <ComboBoxItem Content="Light" />
+        </ComboBox>
+        <muxc:MenuBar>
+            <muxc:MenuBarItem Title="File">
+                <MenuFlyoutItem Text="New" />
+                <MenuFlyoutItem Text="Open..." />
+                <MenuFlyoutItem Text="Save" />
+                <MenuFlyoutItem Text="Exit" />
+            </muxc:MenuBarItem>
+
+            <muxc:MenuBarItem Title="Edit">
+                <MenuFlyoutItem Text="Undo" />
+                <MenuFlyoutItem Text="Cut" />
+                <MenuFlyoutItem Text="Copy" />
+                <MenuFlyoutItem Text="Paste" />
+            </muxc:MenuBarItem>
+
+            <muxc:MenuBarItem Title="Help">
+                <MenuFlyoutItem Text="About" />
+            </muxc:MenuBarItem>
+        </muxc:MenuBar>
+        <muxc:ProgressRing Margin="0,0,0,8" IsActive="True" />
+        <muxc:ProgressBar
+            Width="130"
+            Margin="0,0,0,8"
+            IsIndeterminate="True"
+            ShowError="False"
+            ShowPaused="False" />
         <Button Margin="0,0,0,8" Content="Button" />
         <Slider Margin="0,0,0,8" />
         <TextBox Margin="0,0,0,8" />
-        <ToggleButton Margin="0,0,0,8" />
         <CalendarView Margin="0,0,0,8" />
+        <TimePicker Margin="0,0,0,8" />
+        <DatePicker />
+        <muxc:NumberBox
+            x:Name="NumberBoxSpinButtonPlacementExample"
+            Header="Enter an integer:"
+            LargeChange="100"
+            SmallChange="10"
+            SpinButtonPlacementMode="Compact"
+            Value="1" />
+        <muxc:RadioButtons Header="Options:">
+            <RadioButton Content="Option 1" />
+            <RadioButton Content="Option 2" />
+            <RadioButton Content="Option 3" />
+        </muxc:RadioButtons>
+        <StackPanel>
+            <CheckBox
+                x:Name="OptionsAllCheckBox"
+                Content="Select all"
+                IsThreeState="True" />
+            <CheckBox
+                x:Name="Option1CheckBox"
+                Margin="24,0,0,0"
+                Content="Option 1" />
+            <CheckBox
+                x:Name="Option2CheckBox"
+                Margin="24,0,0,0"
+                Content="Option 2"
+                IsChecked="True" />
+            <CheckBox
+                x:Name="Option3CheckBox"
+                Margin="24,0,0,0"
+                Content="Option 3" />
+        </StackPanel>
+        <muxc:RatingControl AutomationProperties.Name="RatingControl with placeholder" PlaceholderValue="0" />
     </StackPanel>
-</UserControl>
+</controls:NotificationFlyout>
\ No newline at end of file
diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml.cs b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml.cs
index e9182a1..127099a 100644
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml.cs
+++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample/Shell.xaml.cs
@@ -1,27 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-
-// The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
-
-namespace NotificationFlyoutSample
+namespace NotificationFlyoutSample
 {
-    public sealed partial class Shell : UserControl
+    public sealed partial class Shell
     {
         public Shell()
         {
-            this.InitializeComponent();
+            InitializeComponent();
+        }
+
+        private void Theme_SelectionChanged(object sender, Windows.UI.Xaml.Controls.SelectionChangedEventArgs e)
+        {
+            switch (Theme.SelectedIndex)
+            {
+                case 0:
+                    RequestedTheme = Windows.UI.Xaml.ElementTheme.Default;
+                    break;
+                case 1:
+                    RequestedTheme = Windows.UI.Xaml.ElementTheme.Dark;
+                    break;
+                case 2:
+                    RequestedTheme = Windows.UI.Xaml.ElementTheme.Light;
+                    break;
+            }
         }
     }
 }
diff --git a/samples/NotificationFlyoutSample/Shell.xaml b/samples/NotificationFlyoutSample/Shell.xaml
index ea95ba1..9101dd5 100644
--- a/samples/NotificationFlyoutSample/Shell.xaml
+++ b/samples/NotificationFlyoutSample/Shell.xaml
@@ -6,6 +6,9 @@
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     IconSource="/Assets/Icon.ico"
     LightIconSource="/Assets/Icon-Light.ico">
+    <controls:NotificationFlyout.ContextMenuItems>
+        <MenuFlyoutItem Text="Close" />
+    </controls:NotificationFlyout.ContextMenuItems>
     <StackPanel Margin="24">
         <ComboBox
             x:Name="Theme"
diff --git a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout.Uwp.UI.Controls.csproj b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout.Uwp.UI.Controls.csproj
index 0d59f50..d3a5223 100644
--- a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout.Uwp.UI.Controls.csproj
+++ b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout.Uwp.UI.Controls.csproj
@@ -8,6 +8,13 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
+    <None Remove="NotificationFlyout\ContextMenuFlyoutHost.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="NotificationFlyout\ContextMenuFlyoutHost.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="NotificationFlyout\NotificationFlyoutHost.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/ContextMenuFlyoutHost.cs b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/ContextMenuFlyoutHost.cs
new file mode 100644
index 0000000..5d0a280
--- /dev/null
+++ b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/ContextMenuFlyoutHost.cs
@@ -0,0 +1,34 @@
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+
+namespace NotificationFlyout.Uwp.UI.Controls
+{
+    internal class ContextMenuFlyoutHost : Control
+    {
+        private Grid _root;
+
+        public ContextMenuFlyoutHost()
+        {
+            DefaultStyleKey = typeof(ContextMenuFlyoutHost);
+        }
+
+        public void ShowFlyout()
+        {
+            if (_root == null) return;
+            var flyout = FlyoutBase.GetAttachedFlyout(_root);
+            flyout.ShowAt(_root, new FlyoutShowOptions { Placement = FlyoutPlacementMode.BottomEdgeAlignedLeft, ShowMode = FlyoutShowMode.TransientWithDismissOnPointerMoveAway });
+        }
+
+        public void HideFlyout()
+        {
+            if (_root == null) return;
+            var flyout = FlyoutBase.GetAttachedFlyout(_root);
+            flyout.Hide();
+        }
+
+        protected override void OnApplyTemplate()
+        {
+            _root = GetTemplateChild("Root") as Grid;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/ContextMenuFlyoutHost.xaml b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/ContextMenuFlyoutHost.xaml
new file mode 100644
index 0000000..418315b
--- /dev/null
+++ b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/ContextMenuFlyoutHost.xaml
@@ -0,0 +1,20 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:NotificationFlyout.Uwp.UI.Controls">
+    <Style TargetType="controls:ContextMenuFlyoutHost">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:ContextMenuFlyoutHost">
+                    <Grid x:Name="Root">
+                        <FlyoutBase.AttachedFlyout>
+                            <MenuFlyout>
+                                <MenuFlyoutItem Text="Test" />
+                            </MenuFlyout>
+                        </FlyoutBase.AttachedFlyout>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
index 4d38f86..17b6c27 100644
--- a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
+++ b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.cs
@@ -1,5 +1,9 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
 using Windows.UI.Xaml.Markup;
 using Windows.UI.Xaml.Media;
 
@@ -28,9 +32,19 @@ namespace NotificationFlyout.Uwp.UI.Controls
                  typeof(UIElement), typeof(NotificationFlyout),
                  new PropertyMetadata(null, OnContentPropertyChanged));
 
+        public static DependencyProperty ContextMenuItemsProperty =
+            DependencyProperty.Register(nameof(ContextMenuItems),
+                 typeof(IList<MenuFlyoutItemBase>), typeof(NotificationFlyout),
+                 new PropertyMetadata(null));
+
         internal event EventHandler ContentChanged;
-        internal event EventHandler RequestedThemeChanged;
         internal event EventHandler IconSourceChanged;
+        internal event EventHandler RequestedThemeChanged;
+
+        public NotificationFlyout()
+        {
+            ContextMenuItems = new ObservableCollection<MenuFlyoutItemBase>();
+        }
 
         public UIElement Content
         {
@@ -38,6 +52,12 @@ namespace NotificationFlyout.Uwp.UI.Controls
             set => SetValue(ContentProperty, value);
         }
 
+        public IList<MenuFlyoutItemBase> ContextMenuItems
+        {
+            get => (IList<MenuFlyoutItemBase>)GetValue(ContextMenuItemsProperty);
+            set => SetValue(ContextMenuItemsProperty, value);
+        }
+
         public ImageSource IconSource
         {
             get => (ImageSource)GetValue(IconSourceProperty);
diff --git a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutHost.cs b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutHost.cs
index 8af2415..6d533f2 100644
--- a/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutHost.cs
+++ b/src/NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutHost.cs
@@ -6,7 +6,7 @@ using Windows.UI.Xaml.Media;
 
 namespace NotificationFlyout.Uwp.UI.Controls
 {
-    public class NotificationFlyoutHost : Control
+    internal class NotificationFlyoutHost : Control
     {
         public static readonly DependencyProperty ContentProperty =
             DependencyProperty.Register(nameof(Content),
diff --git a/src/NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml b/src/NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml
index 3c597f0..2052801 100644
--- a/src/NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml
+++ b/src/NotificationFlyout.Uwp.UI.Controls/Themes/Generic.xaml
@@ -2,5 +2,6 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutHost.xaml" />
         <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyoutPresenter.xaml" />
+        <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/ContextMenuFlyoutHost.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout - Backup.Wpf.UI.Controls.csproj b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout - Backup.Wpf.UI.Controls.csproj
new file mode 100644
index 0000000..607c21f
--- /dev/null
+++ b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout - Backup.Wpf.UI.Controls.csproj	
@@ -0,0 +1,25 @@
+<Project Sdk="MSBuild.Sdk.Extras">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <AssetTargetFallback>uap10.0.19041</AssetTargetFallback>
+    <Platforms>AnyCPU;x64</Platforms>
+    <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost" Version="6.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\NotificationFlyout.Uwp.UI.Controls\NotificationFlyout.Uwp.UI.Controls.csproj" />
+    <ProjectReference Include="..\NotificationFlyout.Uwp.UI\NotificationFlyout.Uwp.UI.csproj" />
+    <ProjectReference Include="..\NotificationFlyout.Wpf.UI\NotificationFlyout.Wpf.UI.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.VCRTForwarders.140" Version="1.0.7" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
index 337fe2b..6e9b064 100644
--- a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
+++ b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
@@ -11,11 +11,11 @@ namespace NotificationFlyout.Wpf.UI.Controls
                 typeof(Uwp.UI.Controls.NotificationFlyout), typeof(NotificationFlyoutApplication),
                 new PropertyMetadata(null, OnFlyoutPropertyChanged));
 
-        private readonly NotificationFlyoutXamlHost _xamlHost;
+        private readonly NotificationFlyoutXamlHostWindow _xamlHost;
 
         public NotificationFlyoutApplication()
         {
-            _xamlHost = new NotificationFlyoutXamlHost();
+            _xamlHost = new NotificationFlyoutXamlHostWindow();
             _xamlHost.Show();
         }
 
diff --git a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs
new file mode 100644
index 0000000..67e836d
--- /dev/null
+++ b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutContextMenuXamlHost.cs
@@ -0,0 +1,38 @@
+using NotificationFlyout.Uwp.UI.Controls;
+using NotificationFlyout.Wpf.UI.Extensions;
+using NotificationFlyout.Wpf.UI.Helpers;
+using System;
+
+namespace NotificationFlyout.Wpf.UI.Controls
+{
+    internal class ContextMenuXamlHost : XamlHostWindow<ContextMenuFlyoutHost>
+    {
+        public ContextMenuXamlHost()
+        {
+            Topmost = true;
+        }
+
+        protected override void OnDeactivated(EventArgs args)
+        {
+            var flyoutHost = GetHostContent();
+            if (flyoutHost != null)
+            {
+                flyoutHost.HideFlyout();
+            }
+        }
+
+        public void ShowContextMenuFlyout()
+        {
+            var position = CursorHelper.GetPhysicalCursorPos();
+            this.SetWindowPosition(position.y, position.x, WindowSize, WindowSize);
+
+            var flyoutHost = GetHostContent();
+            if (flyoutHost != null)
+            {
+                flyoutHost.ShowFlyout();
+            }
+
+            Activate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
index ca79b90..2ca5100 100644
--- a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
+++ b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutXamlHost.cs
@@ -1,32 +1,29 @@
-using Microsoft.Toolkit.Wpf.UI.XamlHost;
-using NotificationFlyout.Uwp.UI.Controls;
+using NotificationFlyout.Uwp.UI.Controls;
 using NotificationFlyout.Wpf.UI.Extensions;
 using NotificationFlyout.Uwp.UI.Extensions;
 using NotificationFlyout.Wpf.UI.Helpers;
 using System;
 using System.Windows;
-using System.Windows.Media;
 using Windows.UI.Xaml.Controls.Primitives;
+using System.Windows.Input;
 
 namespace NotificationFlyout.Wpf.UI.Controls
 {
-    internal class NotificationFlyoutXamlHost : Window
+    internal class NotificationFlyoutXamlHostWindow : XamlHostWindow<NotificationFlyoutHost>
     {
         private const string ShellTrayHandleName = "Shell_TrayWnd";
-        private const double WindowSize = 5;
 
+        private ContextMenuXamlHost _contextMenuXamlHost;
         private Uwp.UI.Controls.NotificationFlyout _flyout;
+
         private bool _isLoaded;
+
         private NotificationIconHelper _notificationIconHelper;
         private SystemPersonalisationHelper _systemPersonalisationHelper;
         private TaskbarHelper _taskbarHelper;
-        private WindowsXamlHost _xamlHost;
 
-        public NotificationFlyoutXamlHost()
+        public NotificationFlyoutXamlHostWindow()
         {
-            PrepareDefaultWindow();
-            PrepareWindowsXamlHost();
-
             Loaded += OnLoaded;
         }
 
@@ -51,7 +48,7 @@ namespace NotificationFlyout.Wpf.UI.Controls
 
         internal void HideFlyout()
         {
-            var flyoutHost = GetFlyoutHost();
+            var flyoutHost = GetHostContent();
             if (flyoutHost != null)
             {
                 flyoutHost.HideFlyout();
@@ -60,7 +57,7 @@ namespace NotificationFlyout.Wpf.UI.Controls
 
         internal void ShowFlyout()
         {
-            var flyoutHost = GetFlyoutHost();
+            var flyoutHost = GetHostContent();
             if (flyoutHost != null)
             {
                 var taskbarState = _taskbarHelper.GetCurrentState();
@@ -78,10 +75,9 @@ namespace NotificationFlyout.Wpf.UI.Controls
             }
         }
 
-        private NotificationFlyoutHost GetFlyoutHost()
+        protected override void OnDeactivated(EventArgs args)
         {
-            if (_xamlHost == null) return null;
-            return _xamlHost.GetUwpInternalObject() as NotificationFlyoutHost;
+            HideFlyout();
         }
 
         private void OnFlyoutContentChanged(object sender, EventArgs args)
@@ -101,7 +97,15 @@ namespace NotificationFlyout.Wpf.UI.Controls
 
         private void OnIconInvoked(object sender, NotificationIconInvokedEventArgs args)
         {
-            ShowFlyout();
+            if (args.MouseButton == MouseButton.Left)
+            {
+                ShowFlyout();
+            }
+
+            if (args.MouseButton == MouseButton.Right)
+            {
+                ShowContextMenuFlyout();
+            }
         }
 
         private void OnLoaded(object sender, RoutedEventArgs args)
@@ -112,7 +116,6 @@ namespace NotificationFlyout.Wpf.UI.Controls
             _isLoaded = true;
 
             UpdateWindow();
-            this.Hidden();
         }
 
         private void OnTaskbarChanged(object sender, EventArgs args)
@@ -125,20 +128,11 @@ namespace NotificationFlyout.Wpf.UI.Controls
             UpdateIcons();
         }
 
-        private void PrepareDefaultWindow()
-        {
-            ShowInTaskbar = false;
-            ShowActivated = false;
-            WindowStyle = WindowStyle.None;
-            ResizeMode = ResizeMode.NoResize;
-            AllowsTransparency = true;
-            Background = new SolidColorBrush(Colors.Transparent);
-            Height = WindowSize;
-            Width = WindowSize;
-        }
-
         private void PrepareNotificationIcon()
         {
+            _contextMenuXamlHost = new ContextMenuXamlHost();
+            _contextMenuXamlHost.Show();
+
             _notificationIconHelper = NotificationIconHelper.Create(this);
             _notificationIconHelper.IconInvoked += OnIconInvoked;
 
@@ -151,20 +145,9 @@ namespace NotificationFlyout.Wpf.UI.Controls
             _taskbarHelper = TaskbarHelper.Create(this);
             _taskbarHelper.TaskbarChanged += OnTaskbarChanged;
         }
-
-        private void PrepareWindowsXamlHost()
+        private void ShowContextMenuFlyout()
         {
-            _xamlHost = new WindowsXamlHost
-            {
-                InitialTypeName = typeof(NotificationFlyoutHost).FullName
-            };
-
-            _xamlHost.Height = 0;
-            _xamlHost.Width = 0;
-            _xamlHost.HorizontalAlignment = HorizontalAlignment.Stretch;
-            _xamlHost.VerticalAlignment = VerticalAlignment.Stretch;
-
-            Content = _xamlHost;
+            _contextMenuXamlHost.ShowContextMenuFlyout();
         }
 
         private void UpdateFlyoutContent()
@@ -174,7 +157,7 @@ namespace NotificationFlyout.Wpf.UI.Controls
             var content = _flyout.Content;
             if (content == null) return;
 
-            var flyoutHost = GetFlyoutHost();
+            var flyoutHost = GetHostContent();
             if (flyoutHost != null)
             {
                 flyoutHost.Content = content;
@@ -208,7 +191,7 @@ namespace NotificationFlyout.Wpf.UI.Controls
 
             var requestedTheme = _flyout.RequestedTheme;
 
-            var flyoutHost = GetFlyoutHost();
+            var flyoutHost = GetHostContent();
             if (flyoutHost != null)
             {
                 flyoutHost.RequestedTheme = requestedTheme;
@@ -219,7 +202,7 @@ namespace NotificationFlyout.Wpf.UI.Controls
         {
             if (!_isLoaded) return;
 
-            var flyoutHost = GetFlyoutHost();
+            var flyoutHost = GetHostContent();
             if (flyoutHost == null) return;
 
             var taskbarState = _taskbarHelper.GetCurrentState();
@@ -231,7 +214,7 @@ namespace NotificationFlyout.Wpf.UI.Controls
             var windowHeight = WindowSize * this.DpiY();
 
             double top, left, height, width;
-       
+
             var taskbarRect = taskbarState.Rect;
             switch (taskbarState.Position)
             {
diff --git a/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/XamlHostWindow.cs b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/XamlHostWindow.cs
new file mode 100644
index 0000000..91b3e96
--- /dev/null
+++ b/src/NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/XamlHostWindow.cs
@@ -0,0 +1,60 @@
+using Microsoft.Toolkit.Wpf.UI.XamlHost;
+using NotificationFlyout.Wpf.UI.Extensions;
+using System.Windows;
+using System.Windows.Media;
+
+namespace NotificationFlyout.Wpf.UI.Controls
+{
+    internal class XamlHostWindow<TXamlContent> : Window where TXamlContent : class
+    {
+        internal const double WindowSize = 5;
+        private WindowsXamlHost _xamlHost;
+
+        public XamlHostWindow()
+        {
+            PrepareDefaultWindow();
+            PrepareWindowsXamlHost();
+
+            Loaded += OnLoaded;
+        }
+
+
+        internal TXamlContent GetHostContent()
+        {
+            if (_xamlHost == null) return null;
+            return _xamlHost.GetUwpInternalObject() as TXamlContent;
+        }
+
+        private void OnLoaded(object sender, RoutedEventArgs args)
+        {
+            this.Hidden();
+        }
+
+        private void PrepareDefaultWindow()
+        {
+            ShowInTaskbar = false;
+            ShowActivated = false;
+            WindowStyle = WindowStyle.None;
+            ResizeMode = ResizeMode.NoResize;
+            AllowsTransparency = true;
+            Background = new SolidColorBrush(Colors.Red);
+            Height = WindowSize;
+            Width = WindowSize;
+        }
+
+        private void PrepareWindowsXamlHost()
+        {
+            _xamlHost = new WindowsXamlHost
+            {
+                InitialTypeName = typeof(TXamlContent).FullName
+            };
+
+            _xamlHost.Height = 0;
+            _xamlHost.Width = 0;
+            _xamlHost.HorizontalAlignment = HorizontalAlignment.Stretch;
+            _xamlHost.VerticalAlignment = VerticalAlignment.Stretch;
+
+            Content = _xamlHost;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NotificationFlyout.Wpf.UI/Helpers/CursorHelper.cs b/src/NotificationFlyout.Wpf.UI/Helpers/CursorHelper.cs
new file mode 100644
index 0000000..536041f
--- /dev/null
+++ b/src/NotificationFlyout.Wpf.UI/Helpers/CursorHelper.cs
@@ -0,0 +1,13 @@
+using Microsoft.Windows.Sdk;
+
+namespace NotificationFlyout.Wpf.UI.Helpers
+{
+    internal class CursorHelper
+    {
+        public static POINT GetPhysicalCursorPos()
+        {
+            PInvoke.GetPhysicalCursorPos(out POINT point);
+            return point;
+        }
+    }
+}
diff --git a/src/NotificationFlyout.Wpf.UI/Helpers/WindowHelper.cs b/src/NotificationFlyout.Wpf.UI/Helpers/WindowHelper.cs
index 4e741cd..03ff11b 100644
--- a/src/NotificationFlyout.Wpf.UI/Helpers/WindowHelper.cs
+++ b/src/NotificationFlyout.Wpf.UI/Helpers/WindowHelper.cs
@@ -1,5 +1,5 @@
-using Microsoft.Windows.Sdk;
-using System;
+using System;
+using Microsoft.Windows.Sdk;
 
 namespace NotificationFlyout.Wpf.UI.Helpers
 {
diff --git a/src/NotificationFlyout.Wpf.UI/NativeMethods.txt b/src/NotificationFlyout.Wpf.UI/NativeMethods.txt
index d1279bd..f4fe388 100644
--- a/src/NotificationFlyout.Wpf.UI/NativeMethods.txt
+++ b/src/NotificationFlyout.Wpf.UI/NativeMethods.txt
@@ -1,13 +1,13 @@
 Shell_NotifyIcon
-GetDpiForWindow
-FindWindow
 GetSystemMetricsForDpi
 DefWindowProcW
 GetSystemMetrics
 MonitorFromWindow
 RegisterWindowMessage
-FindWindow
 SHAppBarMessage
 SetWindowPos
 GetWindowLong
-SetWindowLong
\ No newline at end of file
+SetWindowLong
+GetDpiForWindow
+FindWindow
+GetPhysicalCursorPos
\ No newline at end of file
diff --git a/src/NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs b/src/NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..f194f50
--- /dev/null
+++ b/src/NotificationFlyout.Wpf.UI/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("NotificationFlyout.Wpf.UI.Controls")]
\ No newline at end of file
diff --git a/src/NotificationFlyout.Wpf.UI/Screen.cs b/src/NotificationFlyout.Wpf.UI/Screen.cs
index 9a294df..f08f35b 100644
--- a/src/NotificationFlyout.Wpf.UI/Screen.cs
+++ b/src/NotificationFlyout.Wpf.UI/Screen.cs
@@ -88,6 +88,7 @@ namespace NotificationFlyout.Wpf.UI
 
             return monitorData;
         }
+
         private Rect GetWorkingArea()
         {
             if (!_multiMonitorSupport || _monitorHandle == (IntPtr)PRIMARY_MONITOR)
diff --git a/src/NotificationFlyout.sln b/src/NotificationFlyout.sln
index 49a5979..19d529b 100644
--- a/src/NotificationFlyout.sln
+++ b/src/NotificationFlyout.sln
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		global.json = global.json
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotificationFlyout.Uwp.UI", "NotificationFlyout.Uwp.UI\NotificationFlyout.Uwp.UI.csproj", "{3FE0D7F7-1173-4989-BE6C-AD28FE0D4AC9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotificationFlyout.Uwp.UI", "NotificationFlyout.Uwp.UI\NotificationFlyout.Uwp.UI.csproj", "{3FE0D7F7-1173-4989-BE6C-AD28FE0D4AC9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution