Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port microsoft/microsoft-ui-xaml#4345 #600

Merged
merged 1 commit into from
Nov 8, 2023
Merged

Port microsoft/microsoft-ui-xaml#4345 #600

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ModernWpf/Styles/MenuItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,14 @@
BorderThickness="{TemplateBinding BorderThickness}"
Margin="{DynamicResource MenuFlyoutItemMargin}"
CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}">
<Grid x:Name="AnimationRoot">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition SharedSizeGroup="{TemplateBinding Visibility, Converter={StaticResource SharedSizeGroupConverter}, ConverterParameter=MenuItemCheckColumnGroup}" Width="Auto" />
<ColumnDefinition SharedSizeGroup="{TemplateBinding Visibility, Converter={StaticResource SharedSizeGroupConverter}, ConverterParameter=MenuItemIconColumnGroup}" Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<local:FontIconFallback
x:Name="CheckGlyph"
FontFamily="{DynamicResource SymbolThemeFontFamily}"
Expand Down Expand Up @@ -259,13 +260,14 @@
Margin="{DynamicResource MenuFlyoutItemMargin}"
CornerRadius="{TemplateBinding primitives:ControlHelper.CornerRadius}"
SnapsToDevicePixels="True">
<Grid x:Name="AnimationRoot">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition SharedSizeGroup="MenuItemCheckColumnGroup" Width="Auto" />
<ColumnDefinition SharedSizeGroup="MenuItemIconColumnGroup" Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<Viewbox
x:Name="IconRoot"
Grid.Column="1"
Expand All @@ -274,10 +276,7 @@
Width="16"
Height="16"
Margin="0,0,12,0">
<ContentPresenter
x:Name="IconContent"
ContentSource="Icon"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<ContentPresenter x:Name="IconContent" ContentSource="Icon" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
</Viewbox>
<ContentPresenter
x:Name="ContentPresenter"
Expand Down
Loading