Skip to content

Commit fe9f7d2

Browse files
author
reunion-maestro-bot
committed
Syncing content from committish adaeceaaf89459aea380a1c85d69aebb38f64483
1 parent 468c624 commit fe9f7d2

43 files changed

Lines changed: 3824 additions & 67 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/controls/dev/CommandBarFlyout/CommandBarFlyout_themeresources.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@
354354
<Setter Target="OverflowCheckGlyph.Visibility" Value="Visible" />
355355
<Setter Target="OverflowTextLabel.Visibility" Value="Visible" />
356356
<Setter Target="OverflowTextLabel.Margin" Value="67,0,12,0" />
357+
<Setter Target="IconAndLabelPanel.VerticalAlignment" Value="Center" />
357358
</VisualState.Setters>
358359
</VisualState>
359360
</VisualStateGroup>

‎src/controls/dev/CommonStyles/MenuFlyout_themeresources.xaml‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
3737
<StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
3838
<StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
39+
<StaticResource x:Key="SplitMenuFlyoutItemButtonDividerBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
3940
<StaticResource x:Key="MenuFlyoutPresenterBackground" ResourceKey="DesktopAcrylicTransparentBrush" />
4041
<StaticResource x:Key="MenuFlyoutPresenterBorderBrush" ResourceKey="SurfaceStrokeColorFlyoutBrush" />
4142
<Thickness x:Key="MenuFlyoutPresenterBorderThemeThickness">1</Thickness>
@@ -118,6 +119,7 @@
118119
<StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
119120
<StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundPressed" ResourceKey="SystemColorHighlightTextColorBrush" />
120121
<StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled" ResourceKey="SystemColorGrayTextColorBrush" />
122+
<StaticResource x:Key="SplitMenuFlyoutItemButtonDividerBrush" ResourceKey="SystemColorWindowTextColorBrush" />
121123
<StaticResource x:Key="MenuFlyoutPresenterBackground" ResourceKey="SystemColorWindowColorBrush" />
122124
<StaticResource x:Key="MenuFlyoutPresenterBorderBrush" ResourceKey="SystemColorWindowTextColorBrush" />
123125
<Thickness x:Key="MenuFlyoutPresenterBorderThemeThickness">2</Thickness>
@@ -196,6 +198,7 @@
196198
<StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
197199
<StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
198200
<StaticResource x:Key="MenuFlyoutItemKeyboardAcceleratorTextForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
201+
<StaticResource x:Key="SplitMenuFlyoutItemButtonDividerBrush" ResourceKey="DividerStrokeColorDefaultBrush" />
199202
<StaticResource x:Key="MenuFlyoutPresenterBackground" ResourceKey="DesktopAcrylicTransparentBrush" />
200203
<StaticResource x:Key="MenuFlyoutPresenterBorderBrush" ResourceKey="SurfaceStrokeColorFlyoutBrush" />
201204
<StaticResource x:Key="ToggleMenuFlyoutItemKeyboardAcceleratorTextForeground" ResourceKey="TextFillColorSecondaryBrush" />
@@ -256,11 +259,14 @@
256259
<Thickness x:Key="MenuFlyoutItemMargin">4,2,4,2</Thickness>
257260
<Thickness x:Key="MenuFlyoutItemThemePadding">11,8,11,9</Thickness>
258261
<Thickness x:Key="MenuFlyoutItemThemePaddingNarrow">11,4,11,5</Thickness>
262+
<x:Double x:Key="SplitMenuFlyoutItemSeparatorHeight">18</x:Double>
263+
<x:Double x:Key="SplitMenuFlyoutItemChevronButtonWidth">38</x:Double>
259264
<StaticResource x:Key="MenuFlyoutSystemBackdrop" ResourceKey="AcrylicBackgroundFillColorDefaultBackdrop" />
260265
<Style TargetType="MenuFlyoutPresenter" BasedOn="{StaticResource DefaultMenuFlyoutPresenterStyle}" />
261266
<Style TargetType="MenuFlyoutItem" BasedOn="{StaticResource DefaultMenuFlyoutItemStyle}" />
262267
<Style TargetType="MenuFlyoutSubItem" BasedOn="{StaticResource DefaultMenuFlyoutSubItemStyle}" />
263268
<Style TargetType="ToggleMenuFlyoutItem" BasedOn="{StaticResource DefaultToggleMenuFlyoutItemStyle}" />
269+
<Style TargetType="SplitMenuFlyoutItem" BasedOn="{StaticResource DefaultSplitMenuFlyoutItemStyle}" />
264270
<Style TargetType="MenuFlyoutPresenter" x:Key="DefaultMenuFlyoutPresenterStyle">
265271
<Setter Property="SystemBackdrop" Value="{StaticResource MenuFlyoutSystemBackdrop}" />
266272
<Setter Property="Background" Value="{ThemeResource MenuFlyoutPresenterBackground}" />
@@ -490,6 +496,135 @@
490496
</Setter.Value>
491497
</Setter>
492498
</Style>
499+
<Style TargetType="SplitMenuFlyoutItem" x:Key="DefaultSplitMenuFlyoutItemStyle" BasedOn="{StaticResource DefaultMenuFlyoutItemStyle}">
500+
<Setter Property="UseSystemFocusVisuals" Value="False" />
501+
<Setter Property="Template">
502+
<Setter.Value>
503+
<ControlTemplate TargetType="SplitMenuFlyoutItem">
504+
<Grid x:Name="RootGrid" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Margin="{StaticResource MenuFlyoutItemMargin}" CornerRadius="{TemplateBinding CornerRadius}">
505+
<Grid.Resources>
506+
<Style TargetType="Button">
507+
<Setter Property="Background" Value="Transparent" />
508+
<Setter Property="BorderThickness" Value="0" />
509+
<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
510+
<Setter Property="FocusVisualMargin" Value="-3" />
511+
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
512+
<Setter Property="Template">
513+
<Setter.Value>
514+
<ControlTemplate TargetType="Button">
515+
<ContentPresenter x:Name="ContentPresenter" Background="{TemplateBinding Background}" Content="{TemplateBinding Content}" ContentTransitions="{TemplateBinding ContentTransitions}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw" />
516+
</ControlTemplate>
517+
</Setter.Value>
518+
</Setter>
519+
</Style>
520+
</Grid.Resources>
521+
<VisualStateManager.VisualStateGroups>
522+
<VisualStateGroup x:Name="CommonStates">
523+
<VisualState x:Name="Normal" />
524+
<VisualState x:Name="PrimaryPointerOver">
525+
<VisualState.Setters>
526+
<Setter Target="PrimaryButton.Background" Value="{ThemeResource MenuFlyoutItemBackgroundPointerOver}" />
527+
<Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPointerOver}" />
528+
<Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPointerOver}" />
529+
</VisualState.Setters>
530+
</VisualState>
531+
<VisualState x:Name="PrimaryPressed">
532+
<VisualState.Setters>
533+
<Setter Target="PrimaryButton.Background" Value="{ThemeResource MenuFlyoutItemBackgroundPressed}" />
534+
<Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPressed}" />
535+
<Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundPressed}" />
536+
</VisualState.Setters>
537+
</VisualState>
538+
<VisualState x:Name="SecondaryPointerOver">
539+
<VisualState.Setters>
540+
<Setter Target="SecondaryButton.Background" Value="{ThemeResource MenuFlyoutItemBackgroundPointerOver}" />
541+
<Setter Target="FlyoutButtonChevron.Foreground" Value="{ThemeResource MenuFlyoutSubItemChevronPointerOver}" />
542+
</VisualState.Setters>
543+
</VisualState>
544+
<VisualState x:Name="SecondaryPressed">
545+
<VisualState.Setters>
546+
<Setter Target="SecondaryButton.Background" Value="{ThemeResource MenuFlyoutItemBackgroundPressed}" />
547+
<Setter Target="FlyoutButtonChevron.Foreground" Value="{ThemeResource MenuFlyoutSubItemChevronPressed}" />
548+
</VisualState.Setters>
549+
</VisualState>
550+
<VisualState x:Name="SubMenuOpened">
551+
<VisualState.Setters>
552+
<Setter Target="SecondaryButton.Background" Value="{ThemeResource MenuFlyoutSubItemBackgroundSubMenuOpened}" />
553+
<Setter Target="FlyoutButtonChevron.Foreground" Value="{ThemeResource MenuFlyoutSubItemChevronSubMenuOpened}" />
554+
</VisualState.Setters>
555+
</VisualState>
556+
<VisualState x:Name="Disabled">
557+
<VisualState.Setters>
558+
<Setter Target="PrimaryButton.Background" Value="{ThemeResource MenuFlyoutItemBackgroundDisabled}" />
559+
<Setter Target="SecondaryButton.Background" Value="{ThemeResource MenuFlyoutItemBackgroundDisabled}" />
560+
<Setter Target="TextBlock.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundDisabled}" />
561+
<Setter Target="FlyoutButtonChevron.Foreground" Value="{ThemeResource MenuFlyoutSubItemChevronDisabled}" />
562+
<Setter Target="IconContent.Foreground" Value="{ThemeResource MenuFlyoutItemForegroundDisabled}" />
563+
</VisualState.Setters>
564+
</VisualState>
565+
</VisualStateGroup>
566+
<VisualStateGroup x:Name="CheckPlaceholderStates">
567+
<VisualState x:Name="NoPlaceholder" />
568+
<VisualState x:Name="CheckPlaceholder">
569+
<VisualState.Setters>
570+
<Setter Target="TextBlock.Margin" Value="{ThemeResource MenuFlyoutItemPlaceholderThemeThickness}" />
571+
</VisualState.Setters>
572+
</VisualState>
573+
<VisualState x:Name="IconPlaceholder">
574+
<VisualState.Setters>
575+
<Setter Target="TextBlock.Margin" Value="{ThemeResource MenuFlyoutItemPlaceholderThemeThickness}" />
576+
<Setter Target="IconRoot.Visibility" Value="Visible" />
577+
</VisualState.Setters>
578+
</VisualState>
579+
<VisualState x:Name="CheckAndIconPlaceholder">
580+
<VisualState.Setters>
581+
<Setter Target="TextBlock.Margin" Value="{ThemeResource MenuFlyoutItemDoublePlaceholderThemeThickness}" />
582+
<Setter Target="IconRoot.Margin" Value="{ThemeResource MenuFlyoutItemPlaceholderThemeThickness}" />
583+
<Setter Target="IconRoot.Visibility" Value="Visible" />
584+
</VisualState.Setters>
585+
</VisualState>
586+
</VisualStateGroup>
587+
<VisualStateGroup x:Name="PaddingSizeStates">
588+
<VisualState x:Name="DefaultPadding" />
589+
<VisualState x:Name="NarrowPadding">
590+
<Storyboard>
591+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutGrid" Storyboard.TargetProperty="Padding">
592+
<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource MenuFlyoutItemThemePaddingNarrow}" />
593+
</ObjectAnimationUsingKeyFrames>
594+
</Storyboard>
595+
</VisualState>
596+
</VisualStateGroup>
597+
</VisualStateManager.VisualStateGroups>
598+
<Grid x:Name="BackgroundGrid">
599+
<Grid.ColumnDefinitions>
600+
<ColumnDefinition Width="*" />
601+
<ColumnDefinition Width="Auto" />
602+
<ColumnDefinition Width="Auto" />
603+
</Grid.ColumnDefinitions>
604+
605+
<Button x:Name="PrimaryButton" Grid.Column="0" Grid.ColumnSpan="2" Background="{TemplateBinding Background}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
606+
<Border x:Name="SeparatorGrid" Grid.Column="1" Width="1" Height="{StaticResource SplitMenuFlyoutItemSeparatorHeight}" Background="{ThemeResource SplitMenuFlyoutItemButtonDividerBrush}" />
607+
<Button x:Name="SecondaryButton" Grid.Column="2" Background="{TemplateBinding Background}" Width="{StaticResource SplitMenuFlyoutItemChevronButtonWidth}" CornerRadius="0,4,4,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
608+
</Grid>
609+
<Grid x:Name="LayoutGrid" Padding="{TemplateBinding Padding}">
610+
<Grid>
611+
<Grid.ColumnDefinitions>
612+
<ColumnDefinition Width="*" />
613+
<ColumnDefinition Width="Auto" />
614+
</Grid.ColumnDefinitions>
615+
616+
<Viewbox x:Name="IconRoot" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Center" Width="16" Height="16" Visibility="Collapsed">
617+
<ContentPresenter x:Name="IconContent" Content="{TemplateBinding Icon}" Foreground="{TemplateBinding Foreground}" />
618+
</Viewbox>
619+
<TextBlock x:Name="TextBlock" Grid.Column="0" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" TextTrimming="{ThemeResource MenuFlyoutItemTextTrimming}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" IsHitTestVisible="False" />
620+
<FontIcon x:Name="FlyoutButtonChevron" Grid.Column="1" Glyph="&#xE974;" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="12" AutomationProperties.AccessibilityView="Raw" Foreground="{ThemeResource MenuFlyoutSubItemChevron}" Margin="{StaticResource MenuFlyoutItemChevronMargin}" IsHitTestVisible="False" MirroredWhenRightToLeft="True" />
621+
</Grid>
622+
</Grid>
623+
</Grid>
624+
</ControlTemplate>
625+
</Setter.Value>
626+
</Setter>
627+
</Style>
493628
<Style TargetType="MenuFlyoutSubItem" x:Key="DefaultMenuFlyoutSubItemStyle">
494629
<Setter Property="Background" Value="{ThemeResource MenuFlyoutSubItemBackground}" />
495630
<Setter Property="BorderBrush" Value="{ThemeResource MenuFlyoutSubItemBackgroundBrush}" />

0 commit comments

Comments
 (0)