zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Checkbox null content behavior, and icon stretch in menu.

Browse Source
This commit is contained in:
rabbitism 2023-02-10 12:05:54 +08:00
parent 0797e2e5df
commit 7cababb140
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Semi.Avalonia.Demo/Pages/MenuDemo.axaml
View File

@ -89,6 +89,7 @@
<MenuItem Header="Menu Item with _Checkbox"> <MenuItem Header="Menu Item with _Checkbox">
<MenuItem.Icon> <MenuItem.Icon>
<CheckBox <CheckBox
Padding="0"
BorderThickness="0" BorderThickness="0"
IsChecked="True" IsChecked="True"
IsHitTestVisible="False" /> IsHitTestVisible="False" />
@ -115,6 +116,7 @@
<MenuItem Header="Menu Item with _Checkbox"> <MenuItem Header="Menu Item with _Checkbox">
<MenuItem.Icon> <MenuItem.Icon>
<CheckBox <CheckBox
Padding="0"
BorderThickness="0" BorderThickness="0"
IsChecked="True" IsChecked="True"
IsHitTestVisible="False" /> IsHitTestVisible="False" />

4
src/Semi.Avalonia/Controls/CheckBox.axaml
View File

@ -25,7 +25,7 @@
<Grid <Grid
Grid.Column="0" Grid.Column="0"
Margin="0,2,0,0" Margin="0,0,0,0"
VerticalAlignment="Center"> VerticalAlignment="Center">
<Border <Border
x:Name="NormalRectangle" x:Name="NormalRectangle"
@ -51,6 +51,8 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Content="{TemplateBinding Content}" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplate="{TemplateBinding ContentTemplate}"
IsVisible="{TemplateBinding Content,
Converter={x:Static ObjectConverters.IsNotNull}}"
RecognizesAccessKey="True" RecognizesAccessKey="True"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
</Grid> </Grid>

12
src/Semi.Avalonia/Controls/Menu.axaml
View File

@ -132,15 +132,17 @@
<Viewbox <Viewbox
Name="PART_IconPresenter" Name="PART_IconPresenter"
Width="12" Width="16"
Height="12" Height="16"
Margin="{DynamicResource MenuItemIconMargin}" Margin="{DynamicResource MenuItemIconMargin}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
IsVisible="False" IsVisible="False"
Stretch="UniformToFill" Stretch="Uniform">
StretchDirection="DownOnly"> <ContentPresenter
<ContentPresenter Content="{TemplateBinding Icon}" /> HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{TemplateBinding Icon}" />
</Viewbox> </Viewbox>
<ContentPresenter <ContentPresenter