From 7f448339d7e856d8832a9088779b16735e996e1f Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 22 Apr 2020 01:44:07 +0800
Subject: [PATCH 1/7] remove unused ci

---
 azure-pipelines.yml | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index 5307ec006..000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# .NET Desktop
-# Build and run tests for .NET Desktop or Windows classic desktop solutions.
-# Add steps that publish symbols, save build artifacts, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
-
-trigger:
-- master
-- dev
-
-pool:
-  vmImage: 'vs2017-win2016' #'due to windows SDK dependency for building UWP project'
-
-variables:
-  solution: '**/*.sln'
-  buildPlatform: 'Any CPU'
-  buildConfiguration: 'Release'
-
-steps:
-- task: NuGetToolInstaller@1
-
-- task: NuGetCommand@2
-  inputs:
-    restoreSolution: '$(solution)'
-
-- task: VSBuild@1
-  inputs:
-    solution: '$(solution)'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
-
-- task: VSTest@2
-  inputs:
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'

From 912cb4df6359bda633e89291267b46da513e3893 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 22 Apr 2020 11:59:53 +0800
Subject: [PATCH 2/7] delete unused style

---
 Wox/Themes/Base.xaml | 6 ------
 Wox/Themes/Gray.xaml | 4 +---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Wox/Themes/Base.xaml b/Wox/Themes/Base.xaml
index 6f6083035..171ce4967 100644
--- a/Wox/Themes/Base.xaml
+++ b/Wox/Themes/Base.xaml
@@ -36,12 +36,6 @@
     <Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#D9D9D4" />
     </Style>
-    <Style x:Key="BaseItemNumberStyle" TargetType="{x:Type TextBlock}">
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="3 0 0 0" />
-        <Setter Property="FontSize" Value="22" />
-    </Style>
     <Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
diff --git a/Wox/Themes/Gray.xaml b/Wox/Themes/Gray.xaml
index e52d4201b..e63354cc7 100644
--- a/Wox/Themes/Gray.xaml
+++ b/Wox/Themes/Gray.xaml
@@ -20,9 +20,7 @@
         <Setter Property="Foreground" Value="#333333" />
         <Setter Property="FontWeight" Value="Bold" />
     </Style>
-    <Style x:Key="ItemNumberStyle" BasedOn="{StaticResource BaseItemNumberStyle}" TargetType="{x:Type TextBlock}">
-        <Setter Property="Foreground" Value="#A6A6A6" />
-    </Style>
+
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#A6A6A6" />
     </Style>

From bc8137cf5ec1de1bccc735a76ebc312ed4928d69 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 22 Apr 2020 12:03:19 +0800
Subject: [PATCH 3/7] remove unused property

---
 Wox/ResultListBox.xaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml
index dc3100e0e..b5f06d2bf 100644
--- a/Wox/ResultListBox.xaml
+++ b/Wox/ResultListBox.xaml
@@ -48,7 +48,6 @@
                             </Grid.RowDefinitions>
                             <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
                                        VerticalAlignment="Center" ToolTip="{Binding Result.Title}" x:Name="Title"
-                                       Text="{Binding Result.Title}">
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
                                         <Binding Path="Result.Title" />
@@ -57,7 +56,6 @@
                                 </vm:ResultsViewModel.FormattedText>
                             </TextBlock>
                             <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding Result.SubTitle}"
-                                       Grid.Row="1" x:Name="SubTitle" Text="{Binding Result.SubTitle}">
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
                                         <Binding Path="Result.SubTitle" />

From 641d331adeeb509eb3dd83c61aee8b4a5f4698a1 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 22 Apr 2020 12:03:36 +0800
Subject: [PATCH 4/7] enable cleartype

---
 Wox/ResultListBox.xaml |  3 +++
 Wox/Themes/Base.xaml   | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/Wox/ResultListBox.xaml b/Wox/ResultListBox.xaml
index b5f06d2bf..68a8c9dc4 100644
--- a/Wox/ResultListBox.xaml
+++ b/Wox/ResultListBox.xaml
@@ -48,6 +48,7 @@
                             </Grid.RowDefinitions>
                             <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
                                        VerticalAlignment="Center" ToolTip="{Binding Result.Title}" x:Name="Title"
+                                       RenderOptions.ClearTypeHint="Enabled" >
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
                                         <Binding Path="Result.Title" />
@@ -56,6 +57,8 @@
                                 </vm:ResultsViewModel.FormattedText>
                             </TextBlock>
                             <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding Result.SubTitle}"
+                                       Grid.Row="1" x:Name="SubTitle" 
+                                       RenderOptions.ClearTypeHint="Enabled" >
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
                                         <Binding Path="Result.SubTitle" />
diff --git a/Wox/Themes/Base.xaml b/Wox/Themes/Base.xaml
index 171ce4967..7210d14fc 100644
--- a/Wox/Themes/Base.xaml
+++ b/Wox/Themes/Base.xaml
@@ -11,6 +11,24 @@
         <Setter Property="CaretBrush" Value="#E3E0E3" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                        <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"
+                                      Background="{TemplateBinding Background}">
+                            <ScrollViewer.ContentTemplate>
+                                <DataTemplate>
+                                    <Grid Background="{Binding Background, ElementName=PART_ContentHost}" RenderOptions.ClearTypeHint="Enabled">
+                                        <ContentPresenter Content="{Binding Path=Content, ElementName=PART_ContentHost}"></ContentPresenter>
+                                    </Grid>
+                                </DataTemplate>
+                            </ScrollViewer.ContentTemplate>
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
     </Style>
     <Style x:Key="BaseWindowBorderStyle" TargetType="{x:Type Border}">
         <Setter Property="BorderThickness" Value="0" />

From 312df9b88d5adbb928897109f932b63ff8c33b12 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 22 Apr 2020 12:04:01 +0800
Subject: [PATCH 5/7] increase fontsize

bold text need bigger text
---
 Wox/Themes/Base.xaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Wox/Themes/Base.xaml b/Wox/Themes/Base.xaml
index 7210d14fc..0392464af 100644
--- a/Wox/Themes/Base.xaml
+++ b/Wox/Themes/Base.xaml
@@ -48,15 +48,16 @@
     <!-- Item Style -->
     <Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
-        <Setter Property="FontSize" Value="16" />
+        <Setter Property="FontSize" Value="18" />
         <Setter Property="FontWeight" Value="Medium" />
     </Style>
     <Style x:Key="BaseItemSubTitleStyle" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#D9D9D4" />
     </Style>
+
     <Style x:Key="BaseItemTitleSelectedStyle" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#FFFFF8" />
-        <Setter Property="FontSize" Value="16" />
+        <Setter Property="FontSize" Value="18" />
         <Setter Property="FontWeight" Value="Medium" />
     </Style>
     <Style x:Key="BaseItemSubTitleSelectedStyle" TargetType="{x:Type TextBlock}" >

From a2828911698603e5405fd43c5ac71dfffb40fd13 Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 22 Apr 2020 12:26:44 +0800
Subject: [PATCH 6/7] misc

---
 Wox/Converters/HighlightTextConverter.cs | 5 ++++-
 Wox/Themes/Gray.xaml                     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Wox/Converters/HighlightTextConverter.cs b/Wox/Converters/HighlightTextConverter.cs
index b7d6d0683..11e961711 100644
--- a/Wox/Converters/HighlightTextConverter.cs
+++ b/Wox/Converters/HighlightTextConverter.cs
@@ -30,7 +30,10 @@ public object Convert(object[] value, Type targetType, object parameter, Culture
                 var currentCharacter = text.Substring(i, 1);
                 if (this.ShouldHighlight(highlightData, i))
                 {
-                    textBlock.Inlines.Add(new Bold(new Run(currentCharacter)));
+                    textBlock.Inlines.Add((new Run(currentCharacter)
+                    {
+                        FontWeight = FontWeights.Bold
+                    }));
                 }
                 else
                 {
diff --git a/Wox/Themes/Gray.xaml b/Wox/Themes/Gray.xaml
index e63354cc7..69418feed 100644
--- a/Wox/Themes/Gray.xaml
+++ b/Wox/Themes/Gray.xaml
@@ -18,7 +18,7 @@
     <Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}" />
     <Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#333333" />
-        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="FontWeight" Value="Medium" />
     </Style>
 
     <Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}">

From a3f0442b4ad57ec2b2afbab2d407387174ea48cb Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Wed, 22 Apr 2020 12:29:46 +0800
Subject: [PATCH 7/7] light color for unhighlight text

---
 Wox/Converters/HighlightTextConverter.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Wox/Converters/HighlightTextConverter.cs b/Wox/Converters/HighlightTextConverter.cs
index 11e961711..4a3f6fc21 100644
--- a/Wox/Converters/HighlightTextConverter.cs
+++ b/Wox/Converters/HighlightTextConverter.cs
@@ -7,6 +7,7 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Documents;
+using System.Windows.Media;
 
 namespace Wox.Converters
 {
@@ -37,7 +38,10 @@ public object Convert(object[] value, Type targetType, object parameter, Culture
                 }
                 else
                 {
-                    textBlock.Inlines.Add(new Run(currentCharacter));
+                    textBlock.Inlines.Add(new Run(currentCharacter)
+                    {
+                        Foreground = Brushes.LightGray
+                    });
                 }
             }
             return textBlock;