From c2887e285a6038c2f6e42daf2c902af4fbf14828 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Thu, 25 Nov 2021 15:34:10 +0900
Subject: [PATCH] Fix Color

---
 Flow.Launcher/Resources/CustomControlTemplate.xaml | 3 ++-
 Flow.Launcher/SettingWindow.xaml                   | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 40ae07856..4dcc13309 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5,7 +5,7 @@
     xmlns:ui="http://schemas.modernwpf.com/2019">
 
 
-    <Style TargetType="{x:Type TextBlock}">
+    <Style TargetType="{x:Type ContentControl}">
         <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
     </Style>
 
@@ -1450,6 +1450,7 @@
 
     <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button" />
 
+
     <!--  - Custom Toggle Switch from modern wpf for left label  -->
     <system:TimeSpan x:Key="RepositionDelay">0:0:0.033</system:TimeSpan>
     <KeyTime x:Key="RepositionDuration">0:0:0.367</KeyTime>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 16e518c6e..b6c9d250e 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1674,6 +1674,7 @@
                                                                     <Trigger Property="IsSelected" Value="true">
                                                                         <Setter TargetName="Bd" Property="Background" Value="{DynamicResource ToggleSwitchFillOn}" />
                                                                         <Setter TargetName="Bd2" Property="BorderThickness" Value="0" />
+                                                                        <Setter TargetName="Bd2" Property="TextElement.Foreground" Value="{DynamicResource Color02B}" />
                                                                     </Trigger>
                                                                 </ControlTemplate.Triggers>
                                                             </ControlTemplate>
@@ -1704,11 +1705,6 @@
                                                             Text="{Binding}"
                                                             TextWrapping="Wrap" />
                                                     </Grid>
-                                                    <DataTemplate.Triggers>
-                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ListBoxItem}}, Path=IsSelected}" Value="True">
-                                                            <Setter TargetName="ThemeName" Property="Foreground" Value="{DynamicResource Color02B}" />
-                                                        </DataTrigger>
-                                                    </DataTemplate.Triggers>
                                                 </DataTemplate>
                                             </ListBox.ItemTemplate>
                                             <ListBox.ItemsPanel>