Fix theme bugs.

This commit is contained in:
qianlifeng 2014-02-21 23:43:52 +08:00
parent a9123d2966
commit 85515079d6
3 changed files with 22 additions and 44 deletions

View File

@ -7,45 +7,6 @@
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Themes/Default.xaml"></ResourceDictionary> <ResourceDictionary Source="Themes/Default.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<Style x:Key="BaseWindowStyle" TargetType="{x:Type Window}">
<Setter Property="Height" Value="80" />
<Setter Property="Width" Value="500" />
<Setter Property="Background" Value="#424242" />
</Style>
<Style x:Key="BaseQueryBoxStyle" TargetType="{x:Type TextBox}">
<Setter Property="BorderThickness" Value="0" />
<Setter Property="FontSize" Value="25" />
<Setter Property="FontWeight" Value="Medium" />
<Setter Property="AllowDrop" Value="true" />
<Setter Property="Height" Value="46" />
<Setter Property="Background" Value="#616161" />
<Setter Property="Foreground" Value="#E3E0E3" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
</Style>
<!-- search item title -->
<Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#FFFFF8" />
<Setter Property="FontSize" Value="16" />
<Setter Property="FontWeight" Value="Medium" />
</Style>
<!-- search item selected title -->
<Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#FFFFF8" />
<Setter Property="FontSize" Value="16" />
<Setter Property="FontWeight" Value="Medium" />
</Style>
<!-- search item sub title -->
<Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#D9D9D4" />
</Style>
<Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#D9D9D4" />
</Style>
</ResourceDictionary> </ResourceDictionary>
</Application.Resources> </Application.Resources>
</Application> </Application>

View File

@ -1,7 +1,16 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:system="clr-namespace:System;assembly=mscorlib"> xmlns:system="clr-namespace:System;assembly=mscorlib">
<Style x:Key="QueryBoxStyle" TargetType="{x:Type TextBox}" BasedOn="{StaticResource BaseQueryBoxStyle}"> <Style x:Key="QueryBoxStyle" TargetType="{x:Type TextBox}">
<Setter Property="BorderThickness" Value="0" />
<Setter Property="FontSize" Value="25" />
<Setter Property="FontWeight" Value="Medium" />
<Setter Property="AllowDrop" Value="true" />
<Setter Property="Height" Value="46" />
<Setter Property="Background" Value="#616161" />
<Setter Property="Foreground" Value="#E3E0E3" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
</Style> </Style>
<Style x:Key="WindowStyle" TargetType="{x:Type Window}"> <Style x:Key="WindowStyle" TargetType="{x:Type Window}">
<Setter Property="Height" Value="80" /> <Setter Property="Height" Value="80" />
@ -16,15 +25,21 @@
</Style> </Style>
<!-- Item Style --> <!-- Item Style -->
<Style x:Key="ItemTitleStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemTitleStyle}"> <Style x:Key="ItemTitleStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#FFFFF8" /> <Setter Property="Foreground" Value="#FFFFF8" />
<Setter Property="FontSize" Value="16" />
<Setter Property="FontWeight" Value="Medium" />
</Style> </Style>
<Style x:Key="ItemSubTitleStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemSubTitleStyle}"> <Style x:Key="ItemSubTitleStyle" TargetType="{x:Type TextBlock}" >
<Setter Property="Foreground" Value="#D9D9D4" /> <Setter Property="Foreground" Value="#D9D9D4" />
</Style> </Style>
<Style x:Key="ItemTitleSelectedStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemTitleSelectedStyle}"> <Style x:Key="ItemTitleSelectedStyle" TargetType="{x:Type TextBlock}" >
<Setter Property="Foreground" Value="#FFFFF8" />
<Setter Property="FontSize" Value="16" />
<Setter Property="FontWeight" Value="Medium" />
</Style> </Style>
<Style x:Key="ItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"> <Style x:Key="ItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}" >
<Setter Property="Foreground" Value="#D9D9D4" />
</Style> </Style>
<Color x:Key="ResultItemHighlightBackgroundColor">#4F6180</Color> <Color x:Key="ResultItemHighlightBackgroundColor">#4F6180</Color>

View File

@ -35,6 +35,8 @@
</Style> </Style>
<Style x:Key="ItemTitleSelectedStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="ItemTitleSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#F6F6FF" /> <Setter Property="Foreground" Value="#F6F6FF" />
<Setter Property="FontSize" Value="16"></Setter>
<Setter Property="FontWeight" Value="Medium"></Setter>
</Style> </Style>
<Style x:Key="ItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}"> <Style x:Key="ItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}">
<Setter Property="Foreground" Value="#F6F6FF" /> <Setter Property="Foreground" Value="#F6F6FF" />