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

fix: fix HoverMask and Image order.

Browse Source
This commit is contained in:
Zhang Dian
2024-06-28 16:48:36 +08:00
parent df7a6f188c
commit a95d06a444
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
demo/Ursa.Demo/Pages/AvatarDemo.axaml
View File

@@ -25,10 +25,14 @@
<u:Avatar.HoverMask> <u:Avatar.HoverMask>
<Border Opacity="0.6"> <Border Opacity="0.6">
<Panel> <Panel>
<Ellipse Fill="#16161A" <Border
Width="{Binding $parent[u:Avatar].Width}" Background="#16161A"
Height="{Binding $parent[u:Avatar].Height}" /> Width="{Binding $parent[u:Avatar].Width}"
<PathIcon Width="16" Height="16" Data="{StaticResource IconCamera}" /> Height="{Binding $parent[u:Avatar].Height}" />
<PathIcon
Data="{StaticResource IconCamera}"
Width="{Binding $parent[u:Avatar].FontSize}"
Height="{Binding $parent[u:Avatar].FontSize}" />
</Panel> </Panel>
</Border> </Border>
</u:Avatar.HoverMask> </u:Avatar.HoverMask>
@@ -71,7 +75,22 @@
<u:Avatar Classes="Square Default Green" /> <u:Avatar Classes="Square Default Green" />
<u:Avatar Classes="Square Medium Green" /> <u:Avatar Classes="Square Medium Green" />
<u:Avatar Classes="Square Large Green" /> <u:Avatar Classes="Square Large Green" />
<u:Avatar Classes="Square ExtraLarge Green" /> <u:Avatar Classes="Square ExtraLarge Green" Source="../Assets/Ursa.ico">
<u:Avatar.HoverMask>
<Border Opacity="0.6">
<Panel>
<Border
Background="#16161A"
Width="{Binding $parent[u:Avatar].Width}"
Height="{Binding $parent[u:Avatar].Height}" />
<PathIcon
Data="{StaticResource IconCamera}"
Width="{Binding $parent[u:Avatar].FontSize}"
Height="{Binding $parent[u:Avatar].FontSize}" />
</Panel>
</Border>
</u:Avatar.HoverMask>
</u:Avatar>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

2
src/Ursa.Themes.Semi/Controls/Avatar.axaml
View File

@@ -32,6 +32,7 @@
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" /> VerticalContentAlignment="Center" />
<Image Source="{TemplateBinding Source}" />
<ContentPresenter <ContentPresenter
Name="PART_HoverMask" Name="PART_HoverMask"
IsVisible="False" IsVisible="False"
@@ -39,7 +40,6 @@
CornerRadius="{TemplateBinding CornerRadius}" CornerRadius="{TemplateBinding CornerRadius}"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center" /> VerticalContentAlignment="Center" />
<Image Source="{TemplateBinding Source}" />
</Panel> </Panel>
</Border> </Border>
</ControlTemplate> </ControlTemplate>