[PT Run] Updated themes (dark/light/highcontrast) (#4119)

* Updated themes (dark/light/highcontrast)

* Updated semi-transparent colors to opague colors (for ClearType)

* Added theme brushes (light/dark/high contrast) for scrollbar.

src/modules/launcher/PowerLauncher/MainWindow.xaml

@@ -55,10 +55,10 @@
             x:Name="SearchBoxBorder" 
             Grid.Row="0" 
             Margin="24,24,24,8"  
-            BorderThickness="0" 
+            BorderThickness="1" 
             CornerRadius="4"
             Background="{DynamicResource SystemChromeLow}"
-            BorderBrush="{DynamicResource SystemChromeLow}">
+            BorderBrush="{DynamicResource BorderBrush}">
             <Border.Effect>
                 <DropShadowEffect BlurRadius="12" Opacity="0.3" ShadowDepth="0" />
             </Border.Effect>
@@ -76,11 +76,11 @@
             x:Name="ListBoxBorder"
             Grid.Row="1" 
             Margin="24,8,24,24" 
-            BorderThickness="0"
+            BorderThickness="1"
             CornerRadius="4" 
             Visibility="{Binding Results.Visibility}"
             Background="{DynamicResource SystemChromeLow}"
-            BorderBrush="{DynamicResource SystemChromeLow}">
+            BorderBrush="{DynamicResource BorderBrush}">
             <!--<Border.RenderTransform>
                 <TranslateTransform />
             </Border.RenderTransform>-->

src/modules/launcher/PowerLauncher/ResultList.xaml

@@ -76,7 +76,7 @@
                             <ControlTemplate.Triggers>
                                 <!-- Setting the opacity of the highlight border to improve the contrast of the AccentColorbrush when selected. In UWP we could call a different brush, in WPF we need to play with the opacity of the WindowGlassBrush-->
                                 <Trigger Property="IsMouseOver" Value="True">
-                                    <Setter Property="Opacity" TargetName="HighlightBorder" Value="0.1" />
+                                    <Setter Property="Opacity" TargetName="HighlightBorder" Value="1" />
                                     <Setter Property="Background" TargetName="HighlightBorder" Value="{DynamicResource ListViewItemBackgroundPointerOver}"/>
                                 </Trigger>
                                 <Trigger Property="IsSelected" Value="True">
@@ -158,7 +158,7 @@
                         </Grid.RowDefinitions>
                         <Image x:Name="AppIcon" Height="36" MaxWidth="56" Grid.RowSpan="2" Margin="-8,0,0,0" HorizontalAlignment="Center" Source="{Binding Image}" />
                         <TextBlock x:Name="Title" Grid.Column="1" Text="{Binding Result.Title}" FontWeight="SemiBold" FontSize="20" Margin="0,0,0,-2" VerticalAlignment="Bottom"/>
-                        <TextBlock x:Name="Path" Grid.Column="1" Text= "{Binding Result.SubTitle}" Grid.Row="1" Opacity="0.6" Margin="0,2,0,0" VerticalAlignment="Top"/>
+                        <TextBlock x:Name="Path" Grid.Column="1" Text= "{Binding Result.SubTitle}" Grid.Row="1" Foreground="{DynamicResource SecondaryTextBrush}" Margin="0,2,0,0" VerticalAlignment="Top"/>
                         <ListView                                  
                             HorizontalAlignment="Right" 
                             VerticalAlignment="Center"                                  

src/modules/launcher/PowerLauncher/Styles/UWPScrollBarStyle.xaml

@@ -1,21 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <!-- Light theme -->
-    <SolidColorBrush x:Key="ThumbBrush" Color="#7a7a7a" />
-    <SolidColorBrush x:Key="ThumbPointerOverBrush" Color="#a0a0a0" />
-    <SolidColorBrush x:Key="ThumbPointerPressedBrush" Color="#747474" />
-
-    <!-- Dark theme -->
-    <!--<SolidColorBrush x:Key="ThumbBrush" Color="#7a7a7a" />
-    <SolidColorBrush x:Key="ThumbPointerOverBrush" Color="#767676" />
-    <SolidColorBrush x:Key="ThumbPointerPressedBrush" Color="#a4a4a4" /> -->
-
-    <!-- High contrast  -->
-    <!--<SolidColorBrush x:Key="ThumbBrush" Color="#ffffff" />
-    <SolidColorBrush x:Key="ThumbPointerOverBrush" Color="#1aebff" />
-    <SolidColorBrush x:Key="ThumbPointerPressedBrush" Color="#1aebff" /> -->
-
     <Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="OverridesDefaultStyle" Value="true"/>
@@ -24,7 +9,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Border x:Name="ThumbBorder" CornerRadius="2" Background="{DynamicResource ThumbBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" HorizontalAlignment="Right" Width="4" Margin="0,0,-1,0">
+                    <Border x:Name="ThumbBorder" CornerRadius="2" Background="{DynamicResource ScrollBarThumbBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" HorizontalAlignment="Right" Width="4" Margin="0,0,-1,0">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates" >
                                 <VisualStateGroup.Transitions>
@@ -48,10 +33,10 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="ThumbBorder" Property="CornerRadius" Value="0" />
-                            <Setter TargetName="ThumbBorder" Property="Background" Value="{DynamicResource ThumbPointerOverBrush}" />
+                            <Setter TargetName="ThumbBorder" Property="Background" Value="{DynamicResource ScrollBarThumbPointerOverBrush}" />
                         </Trigger>
                         <Trigger Property="IsMouseCaptured" Value="True">
-                            <Setter TargetName="ThumbBorder" Property="Background" Value="{DynamicResource ThumbPointerPressedBrush}" />
+                            <Setter TargetName="ThumbBorder" Property="Background" Value="{DynamicResource ScrollBarThumbPointerPressedBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

src/modules/launcher/PowerLauncher/Themes/Dark.xaml

@@ -14,9 +14,9 @@
     <system:String x:Key="Theme.ColorScheme">Accent1</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">Black</Color>
 
-    <Color x:Key="SystemBaseMediumLowColor">#66FFFFFF</Color>
+    <Color x:Key="SystemBaseMediumLowColor">#FF818181</Color>
     <SolidColorBrush x:Key="SystemChromeLow" Color="#FF171717" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#66FFFFFF" />
+    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FF818181" />
     <SolidColorBrush x:Key="TextBox.Static.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.Focus.Border" Color="Transparent"/>
@@ -24,8 +24,12 @@
     <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="#61FFFFFF" />
     <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#30FFFFFF" />
     <SolidColorBrush x:Key="ButtonBorderPressed" Color="#61FFFFFF" />
-    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF363636" />
     <SolidColorBrush x:Key="ControlTextBrushKey" Color="White" />
+    <SolidColorBrush x:Key="SecondaryTextBrush" Color="#FF818181" />
     <SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="White" />
-
+    <SolidColorBrush x:Key="BorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ScrollBarThumbBrush" Color="#FF7a7a7a" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBrush" Color="#FF767676" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerPressedBrush" Color="#FFa4a4a4" />
 </ResourceDictionary>

src/modules/launcher/PowerLauncher/Themes/HighContrast1.xaml

@@ -14,17 +14,22 @@
     <system:String x:Key="Theme.ColorScheme">Accent2</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
 
-    <Color x:Key="SystemBaseMediumLowColor">#FF000000</Color>
-    <SolidColorBrush x:Key="SystemChromeLow" Color="White" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FF000000" />
+    <Color x:Key="SystemBaseMediumLowColor">#ffff00</Color>
+    <SolidColorBrush x:Key="SystemChromeLow" Color="Black" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FF008000" />
     <SolidColorBrush x:Key="TextBox.Static.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.Focus.Border" Color="Transparent"/>
-    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBorderPressed" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF000000" />
-    <SolidColorBrush x:Key="ControlTextBrushKey" Color="#FF000000" />
+    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="Black" />
+    <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="White" />
+    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="White" />
+    <SolidColorBrush x:Key="ButtonBorderPressed" Color="White" />
+    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF003300" />
+    <SolidColorBrush x:Key="ControlTextBrushKey" Color="#FFffff00" />
+    <SolidColorBrush x:Key="SecondaryTextBrush" Color="#FF008000" />
     <SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="BorderBrush" Color="White" />
+    <SolidColorBrush x:Key="ScrollBarThumbBrush" Color="White" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBrush" Color="#FF008000" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerPressedBrush" Color="#FF008000" />
 </ResourceDictionary>

src/modules/launcher/PowerLauncher/Themes/HighContrast2.xaml

@@ -14,17 +14,22 @@
     <system:String x:Key="Theme.ColorScheme">Accent3</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
 
-    <Color x:Key="SystemBaseMediumLowColor">#FF000000</Color>
-    <SolidColorBrush x:Key="SystemChromeLow" Color="Orange" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FF000000" />
+    <Color x:Key="SystemBaseMediumLowColor">#ffff00</Color>
+    <SolidColorBrush x:Key="SystemChromeLow" Color="Black" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FFc0c0c0" />
     <SolidColorBrush x:Key="TextBox.Static.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.Focus.Border" Color="Transparent"/>
-    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="Black" />
+    <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="Black" />
+    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="Black" />
     <SolidColorBrush x:Key="ButtonBorderPressed" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF000000" />
-    <SolidColorBrush x:Key="ControlTextBrushKey" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF0000ff" />
+    <SolidColorBrush x:Key="ControlTextBrushKey" Color="#FF00ff00" />
+    <SolidColorBrush x:Key="SecondaryTextBrush" Color="#FFc0c0c0" />
     <SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="BorderBrush" Color="White" />
+    <SolidColorBrush x:Key="ScrollBarThumbBrush" Color="White" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBrush" Color="#FF0000ff" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerPressedBrush" Color="#FF0000ff" />
 </ResourceDictionary>

src/modules/launcher/PowerLauncher/Themes/HighContrastBlack.xaml

@@ -14,17 +14,22 @@
     <system:String x:Key="Theme.ColorScheme">Accent4</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
 
-    <Color x:Key="SystemBaseMediumLowColor">#FF000000</Color>
-    <SolidColorBrush x:Key="SystemChromeLow" Color="Green" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FF000000" />
+    <Color x:Key="SystemBaseMediumLowColor">#66FFFFFF</Color>
+    <SolidColorBrush x:Key="SystemChromeLow" Color="Black" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FF3ff23f" />
     <SolidColorBrush x:Key="TextBox.Static.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.Focus.Border" Color="Transparent"/>
-    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBorderPressed" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF000000" />
-    <SolidColorBrush x:Key="ControlTextBrushKey" Color="#FF000000" />
-    <SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#30FFFFFF" />
+    <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="#61FFFFFF" />
+    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#30FFFFFF" />
+    <SolidColorBrush x:Key="ButtonBorderPressed" Color="#61FFFFFF" />
+    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF0ca7b6" />
+    <SolidColorBrush x:Key="ControlTextBrushKey" Color="White" />
+    <SolidColorBrush x:Key="SecondaryTextBrush" Color="#FF3ff23f" />
+    <SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="White" />
+    <SolidColorBrush x:Key="BorderBrush" Color="White" />
+    <SolidColorBrush x:Key="ScrollBarThumbBrush" Color="White" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBrush" Color="#FF0ca7b6" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerPressedBrush" Color="#FF0ca7b6" />
 </ResourceDictionary>

src/modules/launcher/PowerLauncher/Themes/HighContrastWhite.xaml

@@ -14,17 +14,22 @@
     <system:String x:Key="Theme.ColorScheme">Accent5</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
 
-    <Color x:Key="SystemBaseMediumLowColor">#FF000000</Color>
-    <SolidColorBrush x:Key="SystemChromeLow" Color="Red" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FF000000" />
+    <Color x:Key="SystemBaseMediumLowColor">#66000000</Color>
+    <SolidColorBrush x:Key="SystemChromeLow" Color="White" options:Freeze="True" />
+    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FF600000" />
     <SolidColorBrush x:Key="TextBox.Static.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.Focus.Border" Color="Transparent"/>
-    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ButtonBorderPressed" Color="#FFFFFFFF" />
-    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF000000" />
-    <SolidColorBrush x:Key="ControlTextBrushKey" Color="#FF000000" />
-    <SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#2E000000" />
+    <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="#61000000" />
+    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#FF37006e" />
+    <SolidColorBrush x:Key="ButtonBorderPressed" Color="#FF37006e" />
+    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF9a59db" />
+    <SolidColorBrush x:Key="ControlTextBrushKey" Color="Black" />
+    <SolidColorBrush x:Key="SecondaryTextBrush" Color="#FF600000" />
+    <SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="Black" />
+    <SolidColorBrush x:Key="BorderBrush" Color="Black" />
+    <SolidColorBrush x:Key="ScrollBarThumbBrush" Color="Black" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBrush" Color="#FF9a59db" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerPressedBrush" Color="#FF9a59db" />
 </ResourceDictionary>

src/modules/launcher/PowerLauncher/Themes/Light.xaml

@@ -16,7 +16,7 @@
 
     <Color x:Key="SystemBaseMediumLowColor">#66000000</Color>
     <SolidColorBrush x:Key="SystemChromeLow" Color="#FFF2F2F2" options:Freeze="True" />
-    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#66000000" />
+    <SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#FF5b5b5b" />
     <SolidColorBrush x:Key="TextBox.Static.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="Transparent"/>
     <SolidColorBrush x:Key="TextBox.Focus.Border" Color="Transparent"/>
@@ -24,8 +24,12 @@
     <SolidColorBrush x:Key="ButtonBorderPointerOver" Color="#61000000" />
     <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#33000000" />
     <SolidColorBrush x:Key="ButtonBorderPressed" Color="#61000000" />
-    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FF000000" />
+    <SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#FFd2d2d2" />
     <SolidColorBrush x:Key="ControlTextBrushKey" Color="Black" />
+    <SolidColorBrush x:Key="SecondaryTextBrush" Color="#FF5b5b5b" />
     <SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="Black" />
-
+    <SolidColorBrush x:Key="BorderBrush" Color="Transparent" />
+    <SolidColorBrush x:Key="ScrollBarThumbBrush" Color="#FF7a7a7a" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerOverBrush" Color="#FFa0a0a0" />
+    <SolidColorBrush x:Key="ScrollBarThumbPointerPressedBrush" Color="#FF747474" />
 </ResourceDictionary>