From 4d25d505e0cd5af772f16fc7ae738a1253b7027c Mon Sep 17 00:00:00 2001
From: bao-qian <bao.github@outlook.com>
Date: Sat, 2 Jan 2016 04:34:20 +0000
Subject: [PATCH] Fix color of selected item and mouse item

This is part of .net 4.5 fix, check #393 to see more
---
 Wox/ResultPanel.xaml         | 78 +++++++++++++++++++++++++++---------
 Wox/Themes/BlurBlack.xaml    |  2 +-
 Wox/Themes/BlurWhite.xaml    |  2 +-
 Wox/Themes/Dark.xaml         |  2 +-
 Wox/Themes/Gray.xaml         |  2 +-
 Wox/Themes/Light.xaml        |  2 +-
 Wox/Themes/Metro Server.xaml |  2 +-
 Wox/Themes/Pink.xaml         |  2 +-
 8 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/Wox/ResultPanel.xaml b/Wox/ResultPanel.xaml
index 83e3f4b0e3..6abd51faec 100644
--- a/Wox/ResultPanel.xaml
+++ b/Wox/ResultPanel.xaml
@@ -7,44 +7,82 @@
              xmlns:converters="clr-namespace:Wox.Converters"
              mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100">
 
-    <ListBox x:Name="lbResults" MaxHeight="{Binding ElementName=Results, Path=MaxResultsToShow}" HorizontalContentAlignment="Stretch" PreviewMouseDown="LbResults_OnPreviewMouseDown" Style="{DynamicResource BaseListboxStyle}" SelectionChanged ="lbResults_SelectionChanged"  Focusable="False"  KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single" VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard">
-        <ListBox.Resources>
-            <!--SelectedItem with focus-->
-            <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="{DynamicResource ItemSelectedBackgroundColor}"/>
-            <!--SelectedItem without focus-->
-            <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="{DynamicResource ItemSelectedBackgroundColor}"/>
-        </ListBox.Resources>
+    <ListBox x:Name="lbResults" MaxHeight="{Binding ElementName=Results, Path=MaxResultsToShow}"
+             HorizontalContentAlignment="Stretch" PreviewMouseDown="LbResults_OnPreviewMouseDown"
+             Style="{DynamicResource BaseListboxStyle}" SelectionChanged="lbResults_SelectionChanged" Focusable="False"
+             KeyboardNavigation.DirectionalNavigation="Cycle" SelectionMode="Single"
+             VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Standard">
         <ListBox.ItemTemplate>
             <DataTemplate>
                 <!-- a result item height is 50 including margin -->
-                <Grid HorizontalAlignment="Stretch" Height="40" VerticalAlignment="Stretch" Margin="5" Cursor="Hand">
+                <Grid HorizontalAlignment="Stretch" Height="40" VerticalAlignment="Stretch" Margin="5"
+                      Cursor="Hand">
                     <Grid.Resources>
                         <converters:ImagePathConverter x:Key="ImageConverter" />
                     </Grid.Resources>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="32"></ColumnDefinition>
-                        <ColumnDefinition/>
+                        <ColumnDefinition Width="32" />
+                        <ColumnDefinition />
                         <ColumnDefinition Width="0" />
                     </Grid.ColumnDefinitions>
-                    <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left" Source="{Binding FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}" >
-                    </Image>
+                    <Image x:Name="imgIco" Width="32" Height="32" HorizontalAlignment="Left"
+                           Source="{Binding FullIcoPath,Converter={StaticResource ImageConverter},IsAsync=True}" />
                     <Grid Margin="5 0 5 0" Grid.Column="1" HorizontalAlignment="Stretch">
                         <Grid.RowDefinitions>
-                            <RowDefinition></RowDefinition>
-                            <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition"></RowDefinition>
+                            <RowDefinition />
+                            <RowDefinition Height="Auto" x:Name="SubTitleRowDefinition" />
                         </Grid.RowDefinitions>
-                        <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left" VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle" Text="{Binding Title}"></TextBlock>
-                        <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding SubTitle}" Visibility="{Binding SubTitle, Converter={converters:StringNullOrEmptyToVisibilityConverter}}" Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}"></TextBlock>
+                        <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
+                                   VerticalAlignment="Center" ToolTip="{Binding Title}" x:Name="tbTitle"
+                                   Text="{Binding Title}" />
+                        <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding SubTitle}"
+                                   Visibility="{Binding SubTitle, Converter={converters:StringNullOrEmptyToVisibilityConverter}}"
+                                   Grid.Row="1" x:Name="tbSubTitle" Text="{Binding SubTitle}" />
                     </Grid>
-                    <TextBlock Grid.Column="2" x:Name="tbItemNumber" Style="{DynamicResource ItemNumberStyle}" Text="9"></TextBlock>
+                    <TextBlock Grid.Column="2" x:Name="tbItemNumber" Style="{DynamicResource ItemNumberStyle}" Text="9"/>
                 </Grid>
                 <DataTemplate.Triggers>
-                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
-                        <Setter TargetName="tbTitle" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}"/>
-                        <Setter TargetName="tbSubTitle" Property="Style" Value="{DynamicResource ItemSubTitleSelectedStyle}"/>
+                    <DataTrigger
+                        Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}"
+                        Value="True">
+                        <Setter TargetName="tbTitle" Property="Style" Value="{DynamicResource ItemTitleSelectedStyle}" />
+                        <Setter TargetName="tbSubTitle" Property="Style"
+                                Value="{DynamicResource ItemSubTitleSelectedStyle}" />
                     </DataTrigger>
                 </DataTemplate.Triggers>
             </DataTemplate>
         </ListBox.ItemTemplate>
+        <!--http://stackoverflow.com/questions/16819577/setting-background-color-or-wpf-4-0-listbox-windows-8/#16820062-->
+        <ListBox.ItemContainerStyle>
+            <Style TargetType="{x:Type ListBoxItem}">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                            <Border x:Name="Bd"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    Padding="{TemplateBinding Padding}"
+                                    SnapsToDevicePixels="True">
+                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                  Content="{TemplateBinding Content}"
+                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            </Border>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter TargetName="Bd" Property="Background"
+                                            Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                                    <Setter TargetName="Bd" Property="BorderBrush"
+                                            Value="{DynamicResource ItemSelectedBackgroundColor}" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Style>
+        </ListBox.ItemContainerStyle>
     </ListBox>
 </UserControl>
\ No newline at end of file
diff --git a/Wox/Themes/BlurBlack.xaml b/Wox/Themes/BlurBlack.xaml
index dc1c5ec540..ebd1ef0df7 100644
--- a/Wox/Themes/BlurBlack.xaml
+++ b/Wox/Themes/BlurBlack.xaml
@@ -46,7 +46,7 @@
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#FFFFFFFF"/>
     </Style>
-    <Color x:Key="ItemSelectedBackgroundColor">#356ef3</Color>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#356ef3</SolidColorBrush>
 
     <!-- button style in the middle of the scrollbar -->
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
diff --git a/Wox/Themes/BlurWhite.xaml b/Wox/Themes/BlurWhite.xaml
index f7dbaceab5..4c52ee4d39 100644
--- a/Wox/Themes/BlurWhite.xaml
+++ b/Wox/Themes/BlurWhite.xaml
@@ -46,7 +46,7 @@
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
         <Setter Property="Foreground" Value="#FFFFFFFF"/>
     </Style>
-    <Color x:Key="ItemSelectedBackgroundColor">#356ef3</Color>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#356ef3</SolidColorBrush>
 
     <!-- button style in the middle of the scrollbar -->
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
diff --git a/Wox/Themes/Dark.xaml b/Wox/Themes/Dark.xaml
index 1b3d31f509..9ef1609b2b 100644
--- a/Wox/Themes/Dark.xaml
+++ b/Wox/Themes/Dark.xaml
@@ -28,7 +28,7 @@
     </Style>
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
     </Style>
-    <Color x:Key="ItemSelectedBackgroundColor">#4F6180</Color>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#4F6180</SolidColorBrush>
 
     <!-- button style in the middle of the scrollbar -->
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
diff --git a/Wox/Themes/Gray.xaml b/Wox/Themes/Gray.xaml
index c1246a6ca4..9c862d8f63 100644
--- a/Wox/Themes/Gray.xaml
+++ b/Wox/Themes/Gray.xaml
@@ -33,7 +33,7 @@
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#ffffff" />
     </Style>
-    <Color x:Key="ItemSelectedBackgroundColor">#00AAF6</Color>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#00AAF6</SolidColorBrush>
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
         <Setter Property="Template">
             <Setter.Value>
diff --git a/Wox/Themes/Light.xaml b/Wox/Themes/Light.xaml
index f10fad2419..292ed475a4 100644
--- a/Wox/Themes/Light.xaml
+++ b/Wox/Themes/Light.xaml
@@ -32,7 +32,7 @@
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#F6F6FF" />
     </Style>
-    <Color x:Key="ItemSelectedBackgroundColor">#3875D7</Color>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#3875D7</SolidColorBrush>
 
     <!-- button style in the middle of the scrollbar -->
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
diff --git a/Wox/Themes/Metro Server.xaml b/Wox/Themes/Metro Server.xaml
index 3f22014ca1..832134f9ac 100644
--- a/Wox/Themes/Metro Server.xaml	
+++ b/Wox/Themes/Metro Server.xaml	
@@ -25,7 +25,7 @@
 	<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
 		<Setter Property="Foreground" Value="#c2c2c2" />
 	</Style>
-	<Color x:Key="ItemSelectedBackgroundColor">#006ac1</Color>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#006ac1</SolidColorBrush>
 	<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
 	</Style>
 	<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
diff --git a/Wox/Themes/Pink.xaml b/Wox/Themes/Pink.xaml
index a7b685831c..462fb8be6d 100644
--- a/Wox/Themes/Pink.xaml
+++ b/Wox/Themes/Pink.xaml
@@ -24,7 +24,7 @@
     <Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#c2c2c2" />
     </Style>
-    <Color x:Key="ItemSelectedBackgroundColor">#cc1081</Color>
+    <SolidColorBrush x:Key="ItemSelectedBackgroundColor">#cc1081</SolidColorBrush>
     <Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}"></Style>
     <Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}"></Style>
 </ResourceDictionary>
\ No newline at end of file