From 3237e699ac4cd6fdc045f51ab9e12ba41f482ac0 Mon Sep 17 00:00:00 2001 From: Darren Batchelor Date: Wed, 15 Sep 2021 13:51:31 -0700 Subject: [PATCH 1/3] Upgraded Dismiss button to behave at 225% setting --- .../SamplePages/InAppNotification/InAppNotificationXaml.bind | 3 ++- .../InAppNotification/Styles/MSEdgeNotificationStyle.xaml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind index 54df9a690e2..081c083732b 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind @@ -110,6 +110,7 @@ + @@ -264,7 +265,7 @@ VerticalAlignment="Center" Visibility="{Binding ShowDismissButton, ElementName=ExampleCustomInAppNotification}"> - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml index 00299dec0c3..7978b298201 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml @@ -43,6 +43,7 @@ + @@ -150,9 +151,10 @@ FontFamily="Segoe MDL2 Assets" FontSize="12" VerticalAlignment="Top" + Padding="4" Style="{StaticResource DismissTextBlockButtonStyle}"> - + From a094881d9b404596beb6db990ce8eaf49b331c93 Mon Sep 17 00:00:00 2001 From: Darren Batchelor Date: Wed, 15 Sep 2021 14:36:51 -0700 Subject: [PATCH 2/3] Removed excess white space before transform element --- .../SamplePages/InAppNotification/InAppNotificationXaml.bind | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind index 081c083732b..4200a31c00e 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind @@ -265,7 +265,7 @@ VerticalAlignment="Center" Visibility="{Binding ShowDismissButton, ElementName=ExampleCustomInAppNotification}"> - + From f0e1617dd39469c6c6152d0c40e8b03f74748c07 Mon Sep 17 00:00:00 2001 From: Darren Batchelor Date: Thu, 16 Sep 2021 14:23:58 -0700 Subject: [PATCH 3/3] Consistent 1 pixel Y transform --- .../InAppNotification/Styles/MSEdgeNotificationStyle.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml index 7978b298201..a23f59aa4e1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml @@ -154,7 +154,7 @@ Padding="4" Style="{StaticResource DismissTextBlockButtonStyle}"> - +