From 240609270e05d9035e9b1d2766541d5dc1d15473 Mon Sep 17 00:00:00 2001
From: Daniel Clark <dan_clark@outlook.com>
Date: Sat, 27 Feb 2021 11:57:23 +0000
Subject: [PATCH] fixed issue with margin

---
 samples/NotificationFlyoutSample/SampleFlyout.xaml       | 9 ++++-----
 .../NotificationFlyout/NotificationFlyout.xaml           | 2 +-
 .../NotificationFlyout/NotificationFlyoutApplication.cs  | 2 ++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/samples/NotificationFlyoutSample/SampleFlyout.xaml b/samples/NotificationFlyoutSample/SampleFlyout.xaml
index 869d6ba..e491829 100644
--- a/samples/NotificationFlyoutSample/SampleFlyout.xaml
+++ b/samples/NotificationFlyoutSample/SampleFlyout.xaml
@@ -2,16 +2,15 @@
     x:Class="NotificationFlyoutSample.SampleFlyout"
     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"
-    CornerRadius="6">
+    xmlns:controls="using:TheXamlGuy.NotificationFlyout.Uwp.UI.Controls">
     <controls:NotificationFlyout.ContextFlyout>
         <MenuFlyout>
-            <MenuFlyoutItem Text="Close" Click="OnCloseMenuFlyoutItemClick" />
+            <MenuFlyoutItem Click="OnCloseMenuFlyoutItemClick" Text="Close" />
         </MenuFlyout>
     </controls:NotificationFlyout.ContextFlyout>
-    <Grid Width="500" Height="500">
+    <Grid Width="500" Height="400">
         <Button
-            HorizontalAlignment="Right"
+            HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Content="Hello World!" />
     </Grid>
diff --git a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.xaml b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.xaml
index 8a7ac24..cdc3bb4 100644
--- a/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.xaml
+++ b/src/TheXamlGuy.NotificationFlyout.Uwp.UI.Controls/NotificationFlyout/NotificationFlyout.xaml
@@ -36,7 +36,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="controls:NotificationFlyout">
                     <Border x:Name="Container">
-                        <Grid x:Name="LayoutRoot">
+                        <Grid x:Name="LayoutRoot" Margin="{TemplateBinding Margin}">
                             <Border
                                 x:Name="BackgroundElement"
                                 Padding="{TemplateBinding Padding}"
diff --git a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
index 3b91432..0dc96ae 100644
--- a/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Wpf.UI.Controls/NotificationFlyout/NotificationFlyoutApplication.cs
@@ -107,6 +107,7 @@ namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Controls
 
             UpdateIcons();
         }
+
         private void PrepareFlyoutHost()
         {
             _notificationFlyoutXamlHost = new TransparentXamlHost<ContentControl>();
@@ -126,6 +127,7 @@ namespace TheXamlGuy.NotificationFlyout.Wpf.UI.Controls
             _notificationFlyoutXamlHost.Activate();
             Flyout.Show();
         }
+
         private void UpdateFlyoutPlacement()
         {
             var taskbarState = _taskbarHelper.GetCurrentState();