From c1e58d5e71fe5f4cc8296e7b187a67430c8d18a7 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Wed, 11 Sep 2024 15:56:05 +0800
Subject: [PATCH] fix:fix Toast Alignments.

---
 src/Ursa.Themes.Semi/Controls/Toast.axaml      | 5 ++++-
 src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Ursa.Themes.Semi/Controls/Toast.axaml b/src/Ursa.Themes.Semi/Controls/Toast.axaml
index 7ba3b5b..fb62795 100644
--- a/src/Ursa.Themes.Semi/Controls/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Toast.axaml
@@ -31,7 +31,6 @@
     <ControlTheme x:Key="{x:Type u:ToastCard}" TargetType="u:ToastCard">
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="BorderThickness" Value="{DynamicResource NotificationCardBorderThickness}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource NotificationCardBorderBrush}" />
         <Setter Property="Background" Value="{DynamicResource NotificationCardBackground}" />
         <Setter Property="CornerRadius" Value="{DynamicResource NotificationCardCornerRadius}" />
         <Setter Property="Template">
@@ -47,6 +46,7 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             MinHeight="{DynamicResource ToastCardMinHeight}"
                             Padding="{DynamicResource ToastCardPadding}"
+                            VerticalAlignment="Top"
                             BoxShadow="{DynamicResource NotificationCardBoxShadows}"
                             CornerRadius="{TemplateBinding CornerRadius}">
                             <Grid ColumnDefinitions="Auto,*,Auto">
@@ -55,6 +55,8 @@
                                     Grid.Column="0"
                                     Width="{DynamicResource NotificationCardIconWidth}"
                                     Height="{DynamicResource NotificationCardIconHeight}"
+                                    Margin="{DynamicResource ToastCardIconMargin}"
+                                    VerticalAlignment="Top"
                                     IsVisible="False"
                                     Data="{DynamicResource NotificationCardInformationIconPathData}" />
                                 <ContentControl
@@ -85,6 +87,7 @@
                                     x:Name="PART_CloseButton"
                                     Grid.Column="2"
                                     Theme="{StaticResource ToastCloseButton}"
+                                    VerticalAlignment="Top"
                                     IsVisible="{TemplateBinding ShowClose}"
                                     u:MessageCard.CloseOnClick="True" />
                             </Grid>
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml b/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml
index d6eb92a..cf8622f 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml
@@ -3,6 +3,7 @@
     <x:Double x:Key="ToastCardMinHeight">40</x:Double>
     <Thickness x:Key="ToastCardPadding">12 8</Thickness>
     <Thickness x:Key="ToastCardMargin">12</Thickness>
+    <Thickness x:Key="ToastCardIconMargin">0 2 0 0</Thickness>
 
     <FontWeight x:Key="ToastCardContentFontWeight">600</FontWeight>
     <Thickness x:Key="ToastCardContentMargin">12 0</Thickness>