Update Theme

This commit is contained in:
2022-10-04 23:43:27 +08:00
parent f9a611fc94
commit 62d9a19e0e

View File

@ -73,7 +73,7 @@
<GradientStop Offset="1.0" Color="#888" /> <GradientStop Offset="1.0" Color="#888" />
</LinearGradientBrush> </LinearGradientBrush>
<SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" /> <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource MainColor}" />
<SolidColorBrush x:Key="SolidBorderBrush" Color="#888" /> <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
@ -2136,70 +2136,80 @@
<Style TargetType="{x:Type ComboBox}"> <Style TargetType="{x:Type ComboBox}">
<Setter Property="Foreground" Value="{DynamicResource TextBrush}" /> <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource DefaultedBorderBrush}" />
<Setter Property="SnapsToDevicePixels" Value="true" /> <Setter Property="SnapsToDevicePixels" Value="true" />
<Setter Property="Template" Value="{DynamicResource ComboBoxTemplate}" /> <Setter Property="Template" Value="{DynamicResource ComboBoxTemplate}" />
</Style> </Style>
<ControlTemplate x:Key="ComboBoxTemplate" TargetType="{x:Type ComboBox}"> <ControlTemplate x:Key="ComboBoxTemplate" TargetType="{x:Type ComboBox}">
<Grid x:Name="grid"> <Border
<ToggleButton x:Name="ComboBoxBorder"
x:Name="ToggleButton" Background="{DynamicResource ControlBackgroundBrush}"
Grid.Column="2" BorderBrush="{TemplateBinding BorderBrush}"
ClickMode="Press" BorderThickness="1"
Focusable="false" CornerRadius="3,3,3,3">
IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" <Grid x:Name="grid">
Template="{DynamicResource ComboBoxToggleButton}" /> <ToggleButton
<ContentPresenter x:Name="ToggleButton"
x:Name="ContentSite" Grid.Column="2"
Margin="3,3,23,3" ClickMode="Press"
HorizontalAlignment="Left" Focusable="false"
VerticalAlignment="Center" IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
Content="{TemplateBinding SelectionBoxItem}" Template="{DynamicResource ComboBoxToggleButton}" />
ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" <ContentPresenter
ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" x:Name="ContentSite"
IsHitTestVisible="False" /> Margin="3,3,23,3"
<TextBox HorizontalAlignment="Left"
x:Name="PART_EditableTextBox" VerticalAlignment="Center"
Margin="3,3,23,3" Content="{TemplateBinding SelectionBoxItem}"
HorizontalAlignment="Left" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
VerticalAlignment="Center" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
Background="{DynamicResource LightBrush}" IsHitTestVisible="False" />
BorderBrush="{DynamicResource NormalBorderBrush}" <TextBox
Focusable="True" x:Name="PART_EditableTextBox"
Foreground="{DynamicResource TextBrush}" Margin="3,3,23,3"
IsReadOnly="{TemplateBinding IsReadOnly}" HorizontalAlignment="Left"
Style="{x:Null}" VerticalAlignment="Center"
Template="{DynamicResource ComboBoxTextBox}" Background="{DynamicResource LightBrush}"
Visibility="Hidden" /> BorderBrush="{DynamicResource NormalBorderBrush}"
<Popup Focusable="True"
x:Name="Popup" Foreground="{DynamicResource TextBrush}"
AllowsTransparency="True" IsReadOnly="{TemplateBinding IsReadOnly}"
Focusable="False" Style="{x:Null}"
IsOpen="{TemplateBinding IsDropDownOpen}" Template="{DynamicResource ComboBoxTextBox}"
Placement="Bottom" Visibility="Hidden" />
PopupAnimation="Slide"> <Popup
<Grid x:Name="Popup"
x:Name="DropDown" AllowsTransparency="True"
MinWidth="{TemplateBinding ActualWidth}" Focusable="False"
MaxHeight="{TemplateBinding MaxDropDownHeight}" IsOpen="{TemplateBinding IsDropDownOpen}"
SnapsToDevicePixels="True"> Placement="Bottom"
<Border PopupAnimation="Slide">
x:Name="DropDownBorder" <Grid
Background="{DynamicResource ControlBackgroundBrush}" x:Name="DropDown"
CornerRadius="3,3,3,3" /> MinWidth="{TemplateBinding ActualWidth}"
<ScrollViewer MaxHeight="{TemplateBinding MaxDropDownHeight}"
Margin="4,6,4,6" SnapsToDevicePixels="True">
CanContentScroll="True" <Border
Foreground="{DynamicResource {x:Static SystemColors.ActiveCaptionTextBrushKey}}" x:Name="DropDownBorder"
HorizontalScrollBarVisibility="Auto" Background="{DynamicResource ControlBackgroundBrush}"
SnapsToDevicePixels="True" BorderBrush="{TemplateBinding BorderBrush}"
Style="{DynamicResource NuclearScrollViewer}" BorderThickness="1"
VerticalScrollBarVisibility="Auto"> CornerRadius="3,3,3,3" />
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" /> <ScrollViewer
</ScrollViewer> Margin="4,6,4,6"
</Grid> CanContentScroll="True"
</Popup> Foreground="{DynamicResource {x:Static SystemColors.ActiveCaptionTextBrushKey}}"
</Grid> HorizontalScrollBarVisibility="Auto"
SnapsToDevicePixels="True"
Style="{DynamicResource NuclearScrollViewer}"
VerticalScrollBarVisibility="Auto">
<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" />
</ScrollViewer>
</Grid>
</Popup>
</Grid>
</Border>
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger Property="HasItems" Value="false"> <Trigger Property="HasItems" Value="false">
<Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" /> <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
@ -2454,7 +2464,7 @@
<Setter Property="Template" Value="{DynamicResource TextBoxTemplate}" /> <Setter Property="Template" Value="{DynamicResource TextBoxTemplate}" />
<Setter Property="Foreground" Value="{DynamicResource TextBrush}" /> <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
<Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" /> <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
<Setter Property="BorderBrush" Value="#FF000000" /> <Setter Property="BorderBrush" Value="{DynamicResource DefaultedBorderBrush}" />
</Style> </Style>
<ControlTemplate x:Key="TextBoxTemplate" TargetType="{x:Type TextBox}"> <ControlTemplate x:Key="TextBoxTemplate" TargetType="{x:Type TextBox}">