整理控件库
This commit is contained in:
@@ -15,7 +15,9 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:controls="clr-namespace:WPFluent.Controls"
|
||||
xmlns:system="clr-namespace:System;assembly=mscorlib">
|
||||
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="pack://application:,,,/WPFluent;component/Resources/Variables.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
<Thickness x:Key="ComboBoxPadding">10,8,10,8</Thickness>
|
||||
<Thickness x:Key="ComboBoxBorderThemeThickness">1,1,1,1</Thickness>
|
||||
<Thickness x:Key="ComboBoxAccentBorderThemeThickness">0,0,0,2</Thickness>
|
||||
@@ -32,15 +34,14 @@
|
||||
<!-- Universal WPF UI ContextMenu -->
|
||||
<Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
|
||||
<!-- Universal WPF UI ContextMenu -->
|
||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="CaretBrush" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Setter Property="Visibility" Value="Hidden" />
|
||||
<Setter Property="CaretBrush" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="Cursor" Value="IBeam" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="Margin" Value="0" />
|
||||
<Setter Property="OverridesDefaultStyle" Value="True" />
|
||||
<Setter Property="Padding" Value="0" />
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
<Setter Property="OverridesDefaultStyle" Value="True" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type TextBox}">
|
||||
@@ -54,19 +55,20 @@
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="Visibility" Value="Hidden" />
|
||||
</Style>
|
||||
|
||||
<Style x:Key="DefaultComboBoxToggleButtonStyle" TargetType="{x:Type ToggleButton}">
|
||||
<!-- Focus by parent element -->
|
||||
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
|
||||
<!-- Focus by parent element -->
|
||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Setter Property="Border.CornerRadius" Value="0" />
|
||||
<Setter Property="BorderBrush" Value="Transparent" />
|
||||
<Setter Property="BorderThickness" Value="0" />
|
||||
<Setter Property="Border.CornerRadius" Value="0" />
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="OverridesDefaultStyle" Value="True" />
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ToggleButton}">
|
||||
@@ -91,23 +93,23 @@
|
||||
<!-- Universal WPF UI focus -->
|
||||
<Setter Property="FocusVisualStyle" Value="{DynamicResource DefaultControlFocusVisualStyle}" />
|
||||
<!-- Universal WPF UI focus -->
|
||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Setter Property="Padding" Value="{StaticResource ComboBoxItemContentMargin}" />
|
||||
<Setter Property="Cursor" Value="Hand" />
|
||||
<Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
<Setter Property="Cursor" Value="Hand" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="OverridesDefaultStyle" Value="True" />
|
||||
<Setter Property="Padding" Value="{StaticResource ComboBoxItemContentMargin}" />
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ComboBoxItem}">
|
||||
<Grid Background="Transparent">
|
||||
<Border
|
||||
Name="ContentBorder"
|
||||
Margin="{DynamicResource ComboBoxItemMargin}"
|
||||
Padding="0"
|
||||
VerticalAlignment="Stretch"
|
||||
CornerRadius="{TemplateBinding Border.CornerRadius}"
|
||||
Name="ContentBorder"
|
||||
Padding="0"
|
||||
SnapsToDevicePixels="True">
|
||||
<Grid>
|
||||
<ContentPresenter
|
||||
@@ -133,8 +135,8 @@
|
||||
<Setter TargetName="ContentBorder" Property="Background" Value="{DynamicResource ComboBoxItemBackgroundSelected}" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
|
||||
<Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource ComboBoxItemForegroundSelected}" />
|
||||
<Setter TargetName="ActiveRectangle" Property="Visibility" Value="Visible" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsEnabled" Value="False">
|
||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForegroundDisabled}" />
|
||||
@@ -152,32 +154,39 @@
|
||||
<!-- Universal WPF UI ContextMenu -->
|
||||
<Setter Property="ContextMenu" Value="{DynamicResource DefaultControlContextMenu}" />
|
||||
<!-- Universal WPF UI ContextMenu -->
|
||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
|
||||
<Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
|
||||
<Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
|
||||
<Setter Property="BorderThickness" Value="{StaticResource ComboBoxBorderThemeThickness}" />
|
||||
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
|
||||
<Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource ComboBoxForeground}" />
|
||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
|
||||
<Setter Property="MinHeight" Value="{StaticResource TextControlThemeMinHeight}" />
|
||||
<Setter Property="MinWidth" Value="{StaticResource TextControlThemeMinWidth}" />
|
||||
<Setter Property="OverridesDefaultStyle" Value="True" />
|
||||
<Setter Property="Padding" Value="{StaticResource ComboBoxPadding}" />
|
||||
<Setter Property="Popup.Placement" Value="Bottom" />
|
||||
<Setter Property="Popup.PopupAnimation" Value="None" />
|
||||
<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
|
||||
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
|
||||
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
|
||||
<Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
|
||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
|
||||
<Setter Property="VerticalAlignment" Value="Center" />
|
||||
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
|
||||
<Setter Property="VerticalContentAlignment" Value="Top" />
|
||||
<Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
|
||||
<Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
|
||||
<Setter Property="Padding" Value="{DynamicResource ComboBoxPadding}" />
|
||||
<Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
|
||||
<Setter Property="Popup.PopupAnimation" Value="None" />
|
||||
<!-- WPF doesn't like centering, the animation is ugly and the mouse button sometimes clicks right away. -->
|
||||
<Setter Property="Popup.Placement" Value="Bottom" />
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
<Setter Property="OverridesDefaultStyle" Value="True" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ComboBox}">
|
||||
<Grid>
|
||||
<Border
|
||||
x:Name="AccentBorder"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
BorderBrush="{DynamicResource ComboBoxBorderBrushFocused}"
|
||||
BorderThickness="{StaticResource ComboBoxAccentBorderThemeThickness}"
|
||||
CornerRadius="{TemplateBinding Border.CornerRadius}"
|
||||
Visibility="Collapsed" />
|
||||
<Border
|
||||
x:Name="ContentBorder"
|
||||
Grid.Row="0"
|
||||
@@ -190,64 +199,10 @@
|
||||
BorderThickness="{TemplateBinding BorderThickness}"
|
||||
CornerRadius="{TemplateBinding Border.CornerRadius}">
|
||||
<Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
|
||||
<!--
|
||||
Funky grid - because:
|
||||
Chevron is over Presenter, ToggleButton is over Chevron, TextBox is over ToggleButton.
|
||||
But, TextBox is not over Chevron, so ToggleButton still works.
|
||||
-->
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid Grid.Column="0" Margin="{TemplateBinding Padding}">
|
||||
<ContentPresenter
|
||||
Name="PART_ContentPresenter"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
Content="{TemplateBinding SelectionBoxItem}"
|
||||
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
|
||||
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
|
||||
IsHitTestVisible="False"
|
||||
TextElement.Foreground="{TemplateBinding Foreground}" />
|
||||
</Grid>
|
||||
<Grid Grid.Column="1" Margin="{StaticResource ComboBoxChevronMargin}">
|
||||
<controls:SymbolIcon
|
||||
x:Name="ChevronIcon"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="{StaticResource ComboBoxChevronSize}"
|
||||
Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"
|
||||
RenderTransformOrigin="0.5, 0.5"
|
||||
Symbol="ChevronDown24">
|
||||
<controls:SymbolIcon.RenderTransform>
|
||||
<RotateTransform Angle="0" />
|
||||
</controls:SymbolIcon.RenderTransform>
|
||||
</controls:SymbolIcon>
|
||||
</Grid>
|
||||
<Grid
|
||||
Grid.Column="0"
|
||||
Grid.ColumnSpan="2">
|
||||
<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}" />
|
||||
</Grid>
|
||||
<Grid Grid.Column="0" Margin="{TemplateBinding Padding}">
|
||||
<TextBox
|
||||
x:Name="PART_EditableTextBox"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
FontSize="{TemplateBinding FontSize}"
|
||||
Foreground="{TemplateBinding Foreground}"
|
||||
IsReadOnly="{TemplateBinding IsReadOnly}"
|
||||
Style="{StaticResource DefaultComboBoxTextBoxStyle}" />
|
||||
</Grid>
|
||||
</Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Popup
|
||||
x:Name="Popup"
|
||||
VerticalAlignment="Center"
|
||||
@@ -261,11 +216,11 @@
|
||||
x:Name="DropDownBorder"
|
||||
MinWidth="{TemplateBinding ActualWidth}"
|
||||
Margin="0"
|
||||
Padding="0,4,0,6"
|
||||
Background="{DynamicResource ComboBoxDropDownBackground}"
|
||||
BorderBrush="{DynamicResource ComboBoxDropDownBorderBrush}"
|
||||
BorderThickness="1"
|
||||
CornerRadius="{DynamicResource PopupCornerRadius}"
|
||||
Padding="0,4,0,6"
|
||||
SnapsToDevicePixels="True">
|
||||
<Border.RenderTransform>
|
||||
<TranslateTransform />
|
||||
@@ -288,16 +243,54 @@
|
||||
</Grid>
|
||||
</Border>
|
||||
</Popup>
|
||||
<ContentPresenter
|
||||
Grid.Column="0"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
Content="{TemplateBinding SelectionBoxItem}"
|
||||
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
|
||||
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
|
||||
IsHitTestVisible="False"
|
||||
Name="PART_ContentPresenter"
|
||||
TextElement.Foreground="{TemplateBinding Foreground}" />
|
||||
<ToggleButton
|
||||
Grid.Column="0"
|
||||
Grid.ColumnSpan="2"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
ClickMode="Press"
|
||||
Focusable="False"
|
||||
Foreground="{TemplateBinding Foreground}"
|
||||
IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Name="ToggleButton"
|
||||
Style="{StaticResource DefaultComboBoxToggleButtonStyle}" />
|
||||
<TextBox
|
||||
x:Name="PART_EditableTextBox"
|
||||
Grid.Column="0"
|
||||
Margin="{TemplateBinding Padding}"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
FontSize="{TemplateBinding FontSize}"
|
||||
Foreground="{TemplateBinding Foreground}"
|
||||
IsReadOnly="{TemplateBinding IsReadOnly}"
|
||||
Style="{StaticResource DefaultComboBoxTextBoxStyle}" />
|
||||
<Grid Grid.Column="1" Margin="{StaticResource ComboBoxChevronMargin}">
|
||||
<controls:SymbolIcon
|
||||
x:Name="ChevronIcon"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="{StaticResource ComboBoxChevronSize}"
|
||||
Foreground="{DynamicResource ComboBoxDropDownGlyphForeground}"
|
||||
IsHitTestVisible="False"
|
||||
RenderTransformOrigin="0.5, 0.5"
|
||||
Symbol="ChevronDown24">
|
||||
<controls:SymbolIcon.RenderTransform>
|
||||
<RotateTransform Angle="0" />
|
||||
</controls:SymbolIcon.RenderTransform>
|
||||
</controls:SymbolIcon>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Border>
|
||||
<Border
|
||||
x:Name="AccentBorder"
|
||||
HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
BorderBrush="{DynamicResource ComboBoxBorderBrushFocused}"
|
||||
BorderThickness="{StaticResource ComboBoxAccentBorderThemeThickness}"
|
||||
CornerRadius="{TemplateBinding Border.CornerRadius}"
|
||||
Visibility="Collapsed" />
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<Trigger Property="IsDropDownOpen" Value="True">
|
||||
@@ -305,17 +298,17 @@
|
||||
<BeginStoryboard>
|
||||
<Storyboard>
|
||||
<DoubleAnimation
|
||||
Duration="00:00:00.167"
|
||||
From="0"
|
||||
Storyboard.TargetName="ChevronIcon"
|
||||
Storyboard.TargetProperty="(controls:SymbolIcon.RenderTransform).(RotateTransform.Angle)"
|
||||
From="0"
|
||||
To="180"
|
||||
Duration="00:00:00.167" />
|
||||
To="180" />
|
||||
<DoubleAnimation
|
||||
Duration="00:00:00.167"
|
||||
From="-90"
|
||||
Storyboard.TargetName="DropDownBorder"
|
||||
Storyboard.TargetProperty="(Border.RenderTransform).(TranslateTransform.Y)"
|
||||
From="-90"
|
||||
To="0"
|
||||
Duration="00:00:00.167">
|
||||
To="0">
|
||||
<DoubleAnimation.EasingFunction>
|
||||
<CircleEase EasingMode="EaseOut" />
|
||||
</DoubleAnimation.EasingFunction>
|
||||
@@ -327,11 +320,11 @@
|
||||
<BeginStoryboard>
|
||||
<Storyboard>
|
||||
<DoubleAnimation
|
||||
Duration="00:00:00.167"
|
||||
From="180"
|
||||
Storyboard.TargetName="ChevronIcon"
|
||||
Storyboard.TargetProperty="(controls:SymbolIcon.RenderTransform).(RotateTransform.Angle)"
|
||||
From="180"
|
||||
To="0"
|
||||
Duration="00:00:00.167" />
|
||||
To="0" />
|
||||
</Storyboard>
|
||||
</BeginStoryboard>
|
||||
</Trigger.ExitActions>
|
||||
@@ -339,7 +332,7 @@
|
||||
<Trigger Property="HasItems" Value="False">
|
||||
<Setter TargetName="DropDownBorder" Property="MinHeight" Value="{StaticResource ComboBoxPopupMinHeight}" />
|
||||
</Trigger>
|
||||
<Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="False">
|
||||
<Trigger Property="Popup.AllowsTransparency" Value="False" SourceName="Popup">
|
||||
<Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0" />
|
||||
</Trigger>
|
||||
<Trigger Property="IsGrouping" Value="True">
|
||||
@@ -376,9 +369,10 @@
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
<Setter Property="VerticalContentAlignment" Value="Top" />
|
||||
</Style>
|
||||
|
||||
<Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="{x:Type ComboBoxItem}" />
|
||||
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="{x:Type ComboBox}" />
|
||||
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary>
|
||||
Reference in New Issue
Block a user