8000 Regenerated theme files · dotnet/wpf@b4ff4f0 · GitHub
[go: up one dir, main page]
Skip to content

Commit b4ff4f0

Browse files
dipeshmsftdipeshmsft
committed
Regenerated theme files
1 parent 972f911 commit b4ff4f0

File tree

1 file changed

+6
-115
lines changed
  • src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes

1 file changed

+6
-115
lines changed

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

Lines changed: 6 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -999,121 +999,12 @@
999999
<Setter Property="Popup.Placement" Value="Bottom" />
10001000
<Setter Property="SnapsToDevicePixels" Value="True" />
10011001
<Setter Property="OverridesDefaultStyle" Value="True" />
1002-
<Setter Property="Template">
1003-
<Setter.Value>
1004-
<ControlTemplate TargetType="{x:Type ComboBox}">
1005-
<Grid>
1006-
<Border x:Name="ContentBorder" Grid.Row="0" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Padding="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding Border.CornerRadius}">
1007-
<Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
1008-
<!--
1009-
Funky grid - because:
1010-
Chevron is over Presenter, ToggleButton is over Chevron, TextBox is over ToggleButton.
1011-
But, TextBox is not over Chevron, so ToggleButton still works.
1012-
-->
1013-
<Grid>
1014-
<Grid.ColumnDefinitions>
1015-
<ColumnDefinition Width="*" />
1016-
<ColumnDefinition Width="Auto" />
1017-
</Grid.ColumnDefinitions>
1018-
<Grid Grid.Column="0" Margin="{TemplateBinding Padding}">
1019-
<ContentPresenter Name="PART_ContentPresenter" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" IsHitTestVisible="False" TextElement.Foreground="{TemplateBinding Foreground}" />
1020-
</Grid>
1021-
<Grid Grid.Column="1" Margin="{StaticResource ComboBoxChevronMargin}">
1022-
<TextBlock x:Name="ChevronIcon" Margin="0" VerticalAlignment="Center" FontSize="{StaticResource ComboBoxChevronSize}" Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}" RenderTransformOrigin="0.5, 0.5" FontFamily="{DynamicResource SymbolThemeFontFamily}" Text="{StaticResource ComboBoxChevronDownGlyph}">
1023-
<TextBlock.RenderTransform>
1024-
<RotateTransform Angle="0" />
1025-
</TextBlock.RenderTransform>
1026-
</TextBlock>
1027-
</Grid>
1028-
<Grid Grid.Column="0" Grid.ColumnSpan="2" Margin="0">
1029-
<ToggleButton Name="ToggleButton" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" ClickMode="Press" Focusable="False" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource DefaultComboBoxToggleButtonStyle}" />
1030-
</Grid>
1031-
<Grid Grid.Column="0" Margin="{TemplateBinding Padding}">
1032-
<TextBox x:Name="PART_EditableTextBox" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" IsReadOnly="{TemplateBinding IsReadOnly}" Style="{StaticResource DefaultComboBoxTextBoxStyle}" AutomationProperties.Name="{TemplateBinding AutomationProperties.Name}" />
1033-
</Grid>
1034-
</Grid>
1035-
<Popup x:Name="PART_Popup" MinWidth="{TemplateBinding ActualWidth}" VerticalAlignment="Center" AllowsTransparency="True" Focusable="False" IsOpen="{TemplateBinding IsDropDownOpen}" Placement="{TemplateBinding Popup.Placement}" PopupAnimation="{TemplateBinding Popup.PopupAnimation}" VerticalOffset="1">
1036-
<Border x:Name="DropDownBorder" Padding="0,4,0,6" Background="{DynamicResource ComboBoxDropDownBackground}" BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}" BorderThickness="1.5" CornerRadius="{DynamicResource PopupCornerRadius}" SnapsToDevicePixels="True">
1037-
<!--Will revist this code while doing performance evaluation for dynamic resources.-->
1038-
<Border.RenderTransform>
1039-
<TranslateTransform />
1040-
</Border.RenderTransform>
1041-
<Grid>
1042-
<ScrollViewer MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="0" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" SnapsToDevicePixels="True" TextElement.FontSize="{TemplateBinding FontSize}" TextElement.FontWeight="{TemplateBinding FontWeight}" TextElement.Foreground="{TemplateBinding Foreground}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
1043-
<ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" TextElement.FontSize="{TemplateBinding FontSize}" />
1044-
</ScrollViewer>
1045-
</Grid>
1046-
<Border.Effect>
1047-
<DropShadowEffect BlurRadius="20" Direction="270" Opacity="0.25" ShadowDepth="6" />
1048-
</Border.Effect>
1049-
</Border>
1050-
</Popup>
1051-
</Grid>
1052-
</Border>
1053-
<Border x:Name="AccentBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderBrush="{DynamicResource ComboBoxBorderBrushFocused}" BorderThickness="{StaticResource ComboBoxAccentBorderThemeThickness}" CornerRadius="{TemplateBinding Border.CornerRadius}" Visibility="Collapsed" />
1054-
</Grid>
1055-
<ControlTemplate.Triggers>
1056-
<Trigger Property="IsDropDownOpen" Value="True">
1057-
<Trigger.EnterActions>
1058-
<BeginStoryboard>
1059-
<Storyboard>
1060-
<DoubleAnimation Storyboard.TargetName="ChevronIcon" Storyboard.TargetProperty="(TextBlock.RenderTransform).(RotateTransform.Angle)" From="0" To="180" Duration="00:00:00.167" />
1061-
<DoubleAnimation Storyboard.TargetName="DropDownBorder" Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)" From="-90" To="0" Duration="00:00:00.167">
1062-
<DoubleAnimation.EasingFunction>
1063-
<CircleEase EasingMode="EaseOut" />
1064-
</DoubleAnimation.EasingFunction>
1065-
</DoubleAnimation>
1066-
</Storyboard>
1067-
</BeginStoryboard>
1068-
</Trigger.EnterActions>
1069-
<Trigger.ExitActions>
1070-
<BeginStoryboard>
1071-
<Storyboard>
1072-
<DoubleAnimation Storyboard.TargetName="ChevronIcon" Storyboard.TargetProperty="(TextBlock.RenderTransform).(RotateTransform.Angle)" From="180" To="0" Duration="00:00:00.167" />
1073-
</Storyboard>
1074-
</BeginStoryboard>
1075-
</Trigger.ExitActions>
1076-
</Trigger>
1077-
<Trigger Property="HasItems" Value="False">
1078-
<Setter TargetName="DropDownBorder" Property="MinHeight" Value="{StaticResource ComboBoxPopupMinHeight}" />
1079-
</ 28BE Trigger>
1080-
<Trigger SourceName="PART_Popup" Property="Popup.AllowsTransparency" Value="False">
1081-
<Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0" />
1082-
</Trigger>
1083-
<Trigger Property="IsGrouping" Value="True">
1084-
<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
1085-
</Trigger>
1086-
<Trigger Property="IsEditable" Value="True">
1087-
<Setter Property="IsTabStop" Value="False" />
1088-
<Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
1089-
<Setter TargetName="PART_ContentPresenter" Property="Visibility" Value="Hidden" />
1090-
</Trigger>
1091-
<MultiTrigger>
1092-
<MultiTrigger.Conditions>
1093-
<Condition Property="IsEnabled" Value="True" />
1094-
<Condition Property="IsKeyboardFocusWithin" Value="True" />
1095-
<Condition Property="IsEditable" Value="True" />
1096-
</MultiTrigger.Conditions>
1097-
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxBackgroundFocused}" />
1098-
<Setter TargetName="AccentBorder" Property="Visibility" Value="Visible" />
1099-
</MultiTrigger>
1100-
<MultiTrigger>
1101-
<MultiTrigger.Conditions>
1102-
<Condition Property="IsEnabled" Value="True" />
1103-
<Condition Property="IsMouseOver" Value="True" />
1104-
<Condition Property="IsKeyboardFocusWithin" Value="False" />
1105-
</MultiTrigger.Conditions>
1106-
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxBackgroundPointerOver}" />
1107-
</MultiTrigger>
1108-
<Trigger Property="IsEnabled" Value="False">
1109-
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxBackgroundDisabled}" />
1110-
<Setter TargetName="ContentBorder" Property="BorderBrush" Value="{DynamicResource ComboBoxBorderBrushDisabled}" />
1111-
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
1112-
</Trigger>
1113-
</ControlTemplate.Triggers>
1114-
</ControlTemplate>
1115-
</Setter.Value>
1116-
</Setter>
1002+
<Setter Property="Template" Value="{StaticResource DefaultComboBoxTemplate}" />
1003+
<Style.Triggers>
1004+
<Trigger Property="IsEditable" Value="True">
1005+
<Setter Property="Template" Value="{StaticResource EditableComboBoxTemplate}" />
1006+
</Trigger>
1007+
</Style.Triggers>
11171008
</Style>
11181009
<Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
11191010
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="{x:Type ComboBox}" />

0 commit comments

Comments
 (0)
0