From 85515079d69f7b0502ecd80484dddd0d18ec56c7 Mon Sep 17 00:00:00 2001
From: qianlifeng <qianlf20082163.com>
Date: Fri, 21 Feb 2014 23:43:52 +0800
Subject: [PATCH] Fix theme bugs.

---
 Wox/App.xaml            | 39 ---------------------------------------
 Wox/Themes/Default.xaml | 25 ++++++++++++++++++++-----
 Wox/Themes/Light.xaml   |  2 ++
 3 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/Wox/App.xaml b/Wox/App.xaml
index 814c2d992a..4f0225e563 100644
--- a/Wox/App.xaml
+++ b/Wox/App.xaml
@@ -7,45 +7,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Themes/Default.xaml"></ResourceDictionary>
             </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>
     </Application.Resources>
 </Application>
diff --git a/Wox/Themes/Default.xaml b/Wox/Themes/Default.xaml
index 27f6ed2427..61447daf51 100644
--- a/Wox/Themes/Default.xaml
+++ b/Wox/Themes/Default.xaml
@@ -1,7 +1,16 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     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 x:Key="WindowStyle" TargetType="{x:Type Window}">
         <Setter Property="Height" Value="80" />
@@ -16,15 +25,21 @@
     </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="FontSize" Value="16" />
+        <Setter Property="FontWeight" Value="Medium" />
     </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" />
     </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 x:Key="ItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}">
+    <Style x:Key="ItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}" >
+        <Setter Property="Foreground" Value="#D9D9D4" />
     </Style>
     <Color x:Key="ResultItemHighlightBackgroundColor">#4F6180</Color>
 
diff --git a/Wox/Themes/Light.xaml b/Wox/Themes/Light.xaml
index 8783a105ce..28c8f9f914 100644
--- a/Wox/Themes/Light.xaml
+++ b/Wox/Themes/Light.xaml
@@ -35,6 +35,8 @@
     </Style>
     <Style x:Key="ItemTitleSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#F6F6FF" />
+        <Setter Property="FontSize" Value="16"></Setter>
+        <Setter Property="FontWeight" Value="Medium"></Setter>
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#F6F6FF" />