8000 Fixed MenuItem Header alignment wrt to Icons (#10735) · dotnet/wpf@1711c02 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1711c02

Browse files
dipeshmsftdipeshmsft
authored
Fixed MenuItem Header alignment wrt to Icons (#10735)
* Fixed MenuItem Header alignment wrt to Icons * Removing excess changes to minimize code change for the issue * Pushing generated files * Fixed MenuItem Header alignment when IsCheckable property is True * Fixed SharedSizeGroup name for the columns
1 parent 7f4f566 commit 1711c02

File tree

4 files changed

+38
-22
lines changed

4 files changed

+38
-22
lines changed

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/MenuItem.xaml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
Margin="0,0,6,0"
6868
VerticalAlignment="Center"
6969
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
70-
Content="{TemplateBinding Icon}" />
70+
Content="{TemplateBinding Icon}"/>
7171
<ContentPresenter
7272
x:Name="HeaderPresenter"
7373
Grid.Column="1"
@@ -105,7 +105,13 @@
105105
<TranslateTransform />
106106
</Border.RenderTransform>
107107
<ScrollViewer CanContentScroll="True" Style="{StaticResource MenuItemScrollViewerStyle}">
108-
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
108+
<Grid>
109+
<ItemsPresenter x:Name="ItemsPresenter"
110+
KeyboardNavigation.DirectionalNavigation="Cycle"
111+
KeyboardNavigation.TabNavigation="Cycle"
112+
Grid.IsSharedSizeScope="True"
113+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
114+
</Grid>
109115
</ScrollViewer>
110116
<Border.Effect>
111117
<DropShadowEffect
@@ -169,7 +175,7 @@
169175
CornerRadius="6">
170176
<Grid Margin="10">
171177
<Grid.ColumnDefinitions>
172-
<ColumnDefinition Width="Auto" />
178+
<ColumnDefinition Width="Auto"/>
173179
<ColumnDefinition Width="*" />
174180
</Grid.ColumnDefinitions>
175181
<ContentPresenter
@@ -222,8 +228,8 @@
222228
CornerRadius="4">
223229
<Grid Margin="8,6,8,6">
224230
<Grid.ColumnDefinitions>
225-
<ColumnDefinition Width="Auto" />
226-
<ColumnDefinition Width="Auto" />
231+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemCheckBoxIconColumnGroup"/>
232+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup"/>
227233
<ColumnDefinition Width="*" />
228234
<ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
229235
</Grid.ColumnDefinitions>
@@ -321,7 +327,7 @@
321327
CornerRadius="4">
322328
<Grid x:Name="MenuItemContent" Margin="8,6,8,6">
323329
<Grid.ColumnDefinitions>
324-
<ColumnDefinition Width="Auto" />
330+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup"/>
325331
<ColumnDefinition Width="*" />
326332
<ColumnDefinition Width="Auto" />
327333
</Grid.ColumnDefinitions>
@@ -377,7 +383,11 @@
377383
<TranslateTransform />
378384
</Border.RenderTransform>
379385
<ScrollViewer CanContentScroll="True" Style="{StaticResource MenuItemScrollViewerStyle}">
380-
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
386+
<ItemsPresenter x:Name="ItemsPresenter"
387+
KeyboardNavigation.DirectionalNavigation="Cycle"
388+
KeyboardNavigation.TabNavigation="Cycle"
389+
Grid.IsSharedSizeScope="True"
390+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
381391
</ScrollViewer>
382392
<Border.Effect>
383393
<DropShadowEffect

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3345,7 +3345,9 @@
33453345
<TranslateTransform />
33463346
</Border.RenderTransform>
33473347
<ScrollViewer CanContentScroll="True" Style="{StaticResource MenuItemScrollViewerStyle}">
3348-
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
3348+
<Grid>
3349+
<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" KeyboardNavigation.TabNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
3350+
</Grid>
33493351
</ScrollViewer>
33503352
<Border.Effect>
33513353
<DropShadowEffect BlurRadius="20" Direction="270" Opacity="0.25" ShadowDepth="6" />
@@ -3425,8 +3427,8 @@
34253427
<Border x:Name="Border" Margin="4,1,4,1" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="4">
34263428
<Grid Margin="8,6,8,6">
34273429
<Grid.ColumnDefinitions>
3428-
<ColumnDefinition Width="Auto" />
3429-
<ColumnDefinition Width="Auto" />
3430+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemCheckBoxIconColumnGroup" />
3431+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
34303432
<ColumnDefinition Width="*" />
34313433
<ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
34323434
</Grid.ColumnDefinitions>
@@ -3473,7 +3475,7 @@
34733475
<Border x:Name="Border" Grid.Row="1" Margin="4,1,4,1" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="4">
34743476
<Grid x:Name="MenuItemContent" Margin="8,6,8,6">
34753477
<Grid.ColumnDefinitions>
3476-
<ColumnDefinition Width="Auto" />
3478+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
34773479
<ColumnDefinition Width="*" />
34783480
<ColumnDefinition Width="Auto" />
34793481
</Grid.ColumnDefinitions>
@@ -3491,7 +3493,7 @@
34913493
<TranslateTransform />
34923494
</Border.RenderTransform>
34933495
<ScrollViewer CanContentScroll="True" Style="{StaticResource MenuItemScrollViewerStyle}">
3494-
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
3496+
<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" KeyboardNavigation.TabNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
34953497
</ScrollViewer>
34963498
<Border.Effect>
34973499
<DropShadowEffect BlurRadius="20" Direction="270" Opacity="0.5" ShadowDepth="6" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3285,7 +3285,9 @@
32853285
<TranslateTransform />
32863286
</Border.RenderTransform>
32873287
<ScrollViewer CanContentScroll="True" Style="{StaticResource MenuItemScrollViewerStyle}">
3288-
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
3288+
<Grid>
3289+
<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" KeyboardNavigation.TabNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
3290+
</Grid>
32893291
</ScrollViewer>
32903292
<Border.Effect>
32913293
<DropShadowEffect BlurRadius="20" Direction="270" Opacity="0.25" ShadowDepth="6" />
@@ -3365,8 +3367,8 @@
33653367
<Border x:Name="Border" Margin="4,1,4,1" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="4">
33663368
<Grid Margin="8,6,8,6">
33673369
<Grid.ColumnDefinitions>
3368-
<ColumnDefinition Width="Auto" />
3369-
<ColumnDefinition Width="Auto" />
3370+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemCheckBoxIconColumnGroup" />
3371+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
33703372
<ColumnDefinition Width="*" />
33713373
<ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
33723374
</Grid.ColumnDefinitions>
@@ -3413,7 +3415,7 @@
34133415
<Border x:Name="Border" Grid.Row="1" Margin="4,1,4,1" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="4">
34143416
<Grid x:Name="MenuItemContent" Margin="8,6,8,6">
34153417
<Grid.ColumnDefinitions>
3416-
<ColumnDefinition Width="Auto" />
3418+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
34173419
<ColumnDefinition Width="*" />
34183420
<ColumnDefinition Width="Auto" />
34193421
</Grid.ColumnDefinitions>
@@ -3431,7 +3433,7 @@
34313433
<TranslateTransform />
34323434
</Border.RenderTransform>
34333435
<ScrollViewer CanContentScroll="True" Style="{StaticResource MenuItemScrollViewerStyle}">
3434-
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
3436+
<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" KeyboardNavigation.TabNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
34353437
</ScrollViewer>
34363438
<Border.Effect>
34373439
<DropShadowEffect BlurRadius="20" Direction="270" Opacity="0.5" ShadowDepth="6" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3354,7 +3354,9 @@
33543354
<TranslateTransform />
33553355
</Border.RenderTransform>
33563356
<ScrollViewer CanContentScroll="True" Style="{StaticResource MenuItemScrollViewerStyle}">
3357-
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
3357+
<Grid>
3358+
<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" KeyboardNavigation.TabNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
3359+
</Grid>
33583360
</ScrollViewer>
33593361
<Border.Effect>
33603362
<DropShadowEffect BlurRadius="20" Direction="270" Opacity="0.25" ShadowDepth="6" />
@@ -3434,8 +3436,8 @@
34343436
<Border x:Name="Border" Margin="4,1,4,1" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="4">
34353437
<Grid Margin="8,6,8,6">
34363438
<Grid.ColumnDefinitions>
3437-
<ColumnDefinition Width="Auto" />
3438-
<ColumnDefinition Width="Auto" />
3439+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemCheckBoxIconColumnGroup" />
3440+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
34393441
<ColumnDefinition Width="*" />
34403442
<ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
34413443
</Grid.ColumnDefinitions>
@@ -3482,7 +3484,7 @@
34823484
<Border x:Name="Border" Grid.Row="1" Margin="4,1,4,1" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="4">
34833485
<Grid x:Name="MenuItemContent" Margin="8,6,8,6">
34843486
<Grid.ColumnDefinitions>
3485-
<ColumnDefinition Width="Auto" />
3487+
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup" />
34863488
<ColumnDefinition Width="*" />
34873489
<ColumnDefinition Width="Auto" />
34883490
</Grid.ColumnDefinitions>
@@ -3500,7 +3502,7 @@
35003502
<TranslateTransform />
35013503
</Border.RenderTransform>
35023504
<ScrollViewer CanContentScroll="True" Style="{StaticResource MenuItemScrollViewerStyle}">
3503-
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
3505+
<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Cycle" KeyboardNavigation.TabNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
35043506
</ScrollViewer>
35053507
<Border.Effect>
35063508
<DropShadowEffect BlurRadius="20" Direction="270" Opacity="0.5" ShadowDepth="6" />

0 commit comments

Comments
 (0)
0