From 22fc7f5424349a82e7c55c9feb7bb40990a39198 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 5 Sep 2024 16:17:16 +0800
Subject: [PATCH] feat: adjust margin & padding.

---
 src/Ursa.Themes.Semi/Controls/Toast.axaml     | 40 ++++++++++---------
 .../Themes/Shared/Toast.axaml                 | 10 +++++
 .../Themes/Shared/_index.axaml                |  1 +
 3 files changed, 33 insertions(+), 18 deletions(-)
 create mode 100644 src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml

diff --git a/src/Ursa.Themes.Semi/Controls/Toast.axaml b/src/Ursa.Themes.Semi/Controls/Toast.axaml
index 87a2958..e05f082 100644
--- a/src/Ursa.Themes.Semi/Controls/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Toast.axaml
@@ -37,54 +37,58 @@
         <Setter Property="CornerRadius" Value="{DynamicResource NotificationCardCornerRadius}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ToastCard">
-                <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
+                <LayoutTransformControl x:Name="PART_LayoutTransformControl" UseRenderTransform="True">
                     <Border
-                        Margin="{DynamicResource NotificationCardMargin}"
+                        Margin="{DynamicResource ToastCardMargin}"
                         Background="{TemplateBinding Background}"
                         CornerRadius="{TemplateBinding CornerRadius}">
                         <Border
                             x:Name="PART_RootBorder"
-                            Padding="{DynamicResource NotificationCardPadding}"
-                            BoxShadow="{DynamicResource NotificationCardBoxShadow}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            VerticalAlignment="Stretch"
                             BorderThickness="{TemplateBinding BorderThickness}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            MinHeight="{DynamicResource ToastCardMinHeight}"
+                            Padding="{DynamicResource ToastCardPadding}"
+                            BoxShadow="{DynamicResource NotificationCardBoxShadow}"
                             CornerRadius="{TemplateBinding CornerRadius}">
-                            <StackPanel Orientation="Horizontal">
+                            <Grid ColumnDefinitions="Auto,*,Auto">
                                 <PathIcon
-                                    Name="NotificationIcon"
+                                    x:Name="ToastIcon"
+                                    Grid.Column="0"
                                     Width="{DynamicResource NotificationCardIconWidth}"
                                     Height="{DynamicResource NotificationCardIconHeight}"
-                                    Margin="{DynamicResource NotificationCardIconMargin}"
                                     IsVisible="False"
                                     Data="{DynamicResource NotificationCardInformationIconPathData}" />
                                 <ContentControl
-                                    Name="PART_Content"
-                                    Margin="12 0"
+                                    x:Name="PART_Content"
+                                    Grid.Column="1"
+                                    Margin="{DynamicResource ToastCardContentMargin}"
                                     VerticalContentAlignment="Center"
+                                    MaxWidth="{DynamicResource ToastCardContentMaxWidth}"
                                     Content="{TemplateBinding Content}">
                                     <ContentControl.DataTemplates>
                                         <DataTemplate DataType="u:IToast">
                                             <SelectableTextBlock
                                                 Foreground="{DynamicResource NotificationCardTitleForeground}"
-                                                FontWeight="{DynamicResource NotificationCardTitleFontWeight}"
+                                                FontWeight="{DynamicResource ToastCardContentFontWeight}"
                                                 Text="{Binding Content}"
                                                 TextWrapping="Wrap" />
                                         </DataTemplate>
                                         <DataTemplate DataType="x:String">
                                             <SelectableTextBlock
                                                 Foreground="{DynamicResource NotificationCardTitleForeground}"
-                                                FontWeight="{DynamicResource NotificationCardTitleFontWeight}"
+                                                FontWeight="{DynamicResource ToastCardContentFontWeight}"
                                                 Text="{Binding}"
                                                 TextWrapping="Wrap" />
                                         </DataTemplate>
                                     </ContentControl.DataTemplates>
                                 </ContentControl>
                                 <Button
+                                    x:Name="PART_CloseButton"
+                                    Grid.Column="2"
                                     Theme="{StaticResource ToastCloseButton}"
                                     IsVisible="{TemplateBinding ShowClose}"
                                     u:ToastCard.CloseOnClick="True" />
-                            </StackPanel>
+                            </Grid>
                         </Border>
                     </Border>
                 </LayoutTransformControl>
@@ -150,22 +154,22 @@
             </Style.Animations>
         </Style>
 
-        <Style Selector="^:information /template/ PathIcon#NotificationIcon">
+        <Style Selector="^:information /template/ PathIcon#ToastIcon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource NotificationCardInformationIconForeground}" />
             <Setter Property="Data" Value="{DynamicResource NotificationCardInformationIconPathData}" />
         </Style>
-        <Style Selector="^:success /template/ PathIcon#NotificationIcon">
+        <Style Selector="^:success /template/ PathIcon#ToastIcon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource NotificationCardSuccessIconForeground}" />
             <Setter Property="Data" Value="{DynamicResource NotificationCardSuccessIconPathData}" />
         </Style>
-        <Style Selector="^:warning /template/ PathIcon#NotificationIcon">
+        <Style Selector="^:warning /template/ PathIcon#ToastIcon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource NotificationCardWarningIconForeground}" />
             <Setter Property="Data" Value="{DynamicResource NotificationCardWarningIconPathData}" />
         </Style>
-        <Style Selector="^:error /template/ PathIcon#NotificationIcon">
+        <Style Selector="^:error /template/ PathIcon#ToastIcon">
             <Setter Property="IsVisible" Value="True" />
             <Setter Property="Foreground" Value="{DynamicResource NotificationCardErrorIconForeground}" />
             <Setter Property="Data" Value="{DynamicResource NotificationCardErrorIconPathData}" />
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml b/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml
new file mode 100644
index 0000000..d6eb92a
--- /dev/null
+++ b/src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml
@@ -0,0 +1,10 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <x:Double x:Key="ToastCardMinHeight">40</x:Double>
+    <Thickness x:Key="ToastCardPadding">12 8</Thickness>
+    <Thickness x:Key="ToastCardMargin">12</Thickness>
+
+    <FontWeight x:Key="ToastCardContentFontWeight">600</FontWeight>
+    <Thickness x:Key="ToastCardContentMargin">12 0</Thickness>
+    <x:Double x:Key="ToastCardContentMaxWidth">450</x:Double>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
index 835e77a..41a8d17 100644
--- a/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
+++ b/src/Ursa.Themes.Semi/Themes/Shared/_index.axaml
@@ -20,6 +20,7 @@
         <MergeResourceInclude Source="TagInput.axaml" />
         <MergeResourceInclude Source="Skeleton.axaml" />
         <MergeResourceInclude Source="ThemeSelector.axaml" />
+        <MergeResourceInclude Source="Toast.axaml" />
         <MergeResourceInclude Source="ToolBar.axaml" />
         <MergeResourceInclude Source="TimeBox.axaml" />
     </ResourceDictionary.MergedDictionaries>