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,11 +2136,18 @@
<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}">
<Border
x:Name="ComboBoxBorder"
Background="{DynamicResource ControlBackgroundBrush}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1"
CornerRadius="3,3,3,3">
<Grid x:Name="grid"> <Grid x:Name="grid">
<ToggleButton <ToggleButton
x:Name="ToggleButton" x:Name="ToggleButton"
@ -2186,6 +2193,8 @@
<Border <Border
x:Name="DropDownBorder" x:Name="DropDownBorder"
Background="{DynamicResource ControlBackgroundBrush}" Background="{DynamicResource ControlBackgroundBrush}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="1"
CornerRadius="3,3,3,3" /> CornerRadius="3,3,3,3" />
<ScrollViewer <ScrollViewer
Margin="4,6,4,6" Margin="4,6,4,6"
@ -2200,6 +2209,7 @@
</Grid> </Grid>
</Popup> </Popup>
</Grid> </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}">