Customizable watermark color

#47
srwi · Dec 22, 2020 · 3c792db · 3c792db
1 parent 8eb4292
commit 3c792db
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/EverythingToolbar/SearchBox.xaml b/EverythingToolbar/SearchBox.xaml
@@ -41,7 +41,7 @@
                                            Margin="0, 0, 10, 0"
                                            VerticalAlignment="Center"
                                            Opacity="0"
-                                           Foreground="{DynamicResource SearchBoxForeground}"
+                                           Foreground="{DynamicResource SearchBoxWatermarkForeground}"
                                            IsHitTestVisible="false"
                                            TextTrimming="WordEllipsis"/>
                                 <ScrollViewer x:Name="PART_ContentHost"
@@ -70,7 +70,7 @@
                                         Value="{DynamicResource SearchBoxLogoHover}"/>
                                 <Setter Property="Foreground"
                                         TargetName="SearchBoxWatermark"
-                                        Value="{DynamicResource SearchBoxForegroundHover}"/>
+                                        Value="{DynamicResource SearchBoxWatermarkForegroundHover}"/>
                             </Trigger>
                             <Trigger Property="Control.IsKeyboardFocused" Value="true">
                                 <Setter Property="Background"
@@ -90,7 +90,7 @@
                                         Value="{DynamicResource SearchBoxLogoActive}"/>
                                 <Setter Property="Foreground"
                                         TargetName="SearchBoxWatermark"
-                                        Value="{DynamicResource SearchBoxForegroundActive}"/>
+                                        Value="{DynamicResource SearchBoxWatermarkForegroundActive}"/>
                                 <Setter Property="Foreground"
                                         Value="{DynamicResource SearchBoxForegroundActive}"/>
                             </Trigger>

diff --git a/EverythingToolbar/Themes/Dark.xaml b/EverythingToolbar/Themes/Dark.xaml
@@ -6,6 +6,9 @@
     <SolidColorBrush x:Key="SearchBoxForeground" Color="#ffdadada" />
     <SolidColorBrush x:Key="SearchBoxForegroundHover" Color="#ffdadada" />
     <SolidColorBrush x:Key="SearchBoxForegroundActive" Color="#ffdadada" />
+    <SolidColorBrush x:Key="SearchBoxWatermarkForeground" Color="#ffdadada" />
+    <SolidColorBrush x:Key="SearchBoxWatermarkForegroundHover" Color="#ffdadada" />
+    <SolidColorBrush x:Key="SearchBoxWatermarkForegroundActive" Color="#ffdadada" />
     <SolidColorBrush x:Key="SearchBoxBorder" Color="#ff5c5c5c" />
     <SolidColorBrush x:Key="SearchBoxBorderHover" Color="#ff777777" />
     <SolidColorBrush x:Key="SearchBoxBorderActive" Color="#ff5c5c5c" />

diff --git a/EverythingToolbar/Themes/Light.xaml b/EverythingToolbar/Themes/Light.xaml
@@ -6,6 +6,9 @@
     <SolidColorBrush x:Key="SearchBoxForeground" Color="#ff32302d" />
     <SolidColorBrush x:Key="SearchBoxForegroundHover" Color="#ff32302d" />
     <SolidColorBrush x:Key="SearchBoxForegroundActive" Color="#ff000000" />
+    <SolidColorBrush x:Key="SearchBoxWatermarkForeground" Color="#ff32302d" />
+    <SolidColorBrush x:Key="SearchBoxWatermarkForegroundHover" Color="#ff32302d" />
+    <SolidColorBrush x:Key="SearchBoxWatermarkForegroundActive" Color="#ff000000" />
     <SolidColorBrush x:Key="SearchBoxBorder" Color="#ffcccccc" />
     <SolidColorBrush x:Key="SearchBoxBorderHover" Color="#ffb4b4b4" />
     <SolidColorBrush x:Key="SearchBoxBorderActive" Color="#ff3f3f3f" />

diff --git a/EverythingToolbar/Themes/Medium.xaml b/EverythingToolbar/Themes/Medium.xaml
@@ -6,6 +6,9 @@
     <SolidColorBrush x:Key="SearchBoxForeground" Color="#ffdadada" />
     <SolidColorBrush x:Key="SearchBoxForegroundHover" Color="#ffdadada" />
     <SolidColorBrush x:Key="SearchBoxForegroundActive" Color="#ff2b2b2b" />
+    <SolidColorBrush x:Key="SearchBoxWatermarkForeground" Color="#ffdadada" />
+    <SolidColorBrush x:Key="SearchBoxWatermarkForegroundHover" Color="#ffdadada" />
+    <SolidColorBrush x:Key="SearchBoxWatermarkForegroundActive" Color="#ff2b2b2b" />
     <SolidColorBrush x:Key="SearchBoxBorder" Color="#ff5c5c5c" />
     <SolidColorBrush x:Key="SearchBoxBorderHover" Color="#ff777777" />
     <SolidColorBrush x:Key="SearchBoxBorderActive" Color="#ff3f3f3f" />