chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix:fix Toast Alignments.

Browse Source
This commit is contained in:
Zhang Dian
2024-09-11 15:56:05 +08:00
parent 73bfed8632
commit c1e58d5e71
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Ursa.Themes.Semi/Controls/Toast.axaml
View File

@@ -31,7 +31,6 @@
<ControlTheme x:Key="{x:Type u:ToastCard}" TargetType="u:ToastCard"> <ControlTheme x:Key="{x:Type u:ToastCard}" TargetType="u:ToastCard">
<Setter Property="UseLayoutRounding" Value="True" /> <Setter Property="UseLayoutRounding" Value="True" />
<Setter Property="BorderThickness" Value="{DynamicResource NotificationCardBorderThickness}" /> <Setter Property="BorderThickness" Value="{DynamicResource NotificationCardBorderThickness}" />
<Setter Property="BorderBrush" Value="{DynamicResource NotificationCardBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource NotificationCardBackground}" /> <Setter Property="Background" Value="{DynamicResource NotificationCardBackground}" />
<Setter Property="CornerRadius" Value="{DynamicResource NotificationCardCornerRadius}" /> <Setter Property="CornerRadius" Value="{DynamicResource NotificationCardCornerRadius}" />
<Setter Property="Template"> <Setter Property="Template">
@@ -47,6 +46,7 @@
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
MinHeight="{DynamicResource ToastCardMinHeight}" MinHeight="{DynamicResource ToastCardMinHeight}"
Padding="{DynamicResource ToastCardPadding}" Padding="{DynamicResource ToastCardPadding}"
VerticalAlignment="Top"
BoxShadow="{DynamicResource NotificationCardBoxShadows}" BoxShadow="{DynamicResource NotificationCardBoxShadows}"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Grid ColumnDefinitions="Auto,*,Auto"> <Grid ColumnDefinitions="Auto,*,Auto">
@@ -55,6 +55,8 @@
Grid.Column="0" Grid.Column="0"
Width="{DynamicResource NotificationCardIconWidth}" Width="{DynamicResource NotificationCardIconWidth}"
Height="{DynamicResource NotificationCardIconHeight}" Height="{DynamicResource NotificationCardIconHeight}"
Margin="{DynamicResource ToastCardIconMargin}"
VerticalAlignment="Top"
IsVisible="False" IsVisible="False"
Data="{DynamicResource NotificationCardInformationIconPathData}" /> Data="{DynamicResource NotificationCardInformationIconPathData}" />
<ContentControl <ContentControl
@@ -85,6 +87,7 @@
x:Name="PART_CloseButton" x:Name="PART_CloseButton"
Grid.Column="2" Grid.Column="2"
Theme="{StaticResource ToastCloseButton}" Theme="{StaticResource ToastCloseButton}"
VerticalAlignment="Top"
IsVisible="{TemplateBinding ShowClose}" IsVisible="{TemplateBinding ShowClose}"
u:MessageCard.CloseOnClick="True" /> u:MessageCard.CloseOnClick="True" />
</Grid> </Grid>

1
src/Ursa.Themes.Semi/Themes/Shared/Toast.axaml
View File

@@ -3,6 +3,7 @@
<x:Double x:Key="ToastCardMinHeight">40</x:Double> <x:Double x:Key="ToastCardMinHeight">40</x:Double>
<Thickness x:Key="ToastCardPadding">12 8</Thickness> <Thickness x:Key="ToastCardPadding">12 8</Thickness>
<Thickness x:Key="ToastCardMargin">12</Thickness> <Thickness x:Key="ToastCardMargin">12</Thickness>
<Thickness x:Key="ToastCardIconMargin">0 2 0 0</Thickness>
<FontWeight x:Key="ToastCardContentFontWeight">600</FontWeight> <FontWeight x:Key="ToastCardContentFontWeight">600</FontWeight>
<Thickness x:Key="ToastCardContentMargin">12 0</Thickness> <Thickness x:Key="ToastCardContentMargin">12 0</Thickness>