From 0acd2e12980fe0297f9e2a4d8be5e3e5462b3afe Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sat, 11 Dec 2021 03:20:07 +0900
Subject: [PATCH] Revert "Add Subtext Highlight Setting"

This reverts commit 1a49178ebe6525d66758fe16672c6e1888fc5a5a.
---
 .../UserSettings/Settings.cs                  |  1 -
 .../Converters/HighlightTextConverter.cs      | 13 +----------
 Flow.Launcher/Languages/en.xaml               |  1 -
 Flow.Launcher/SettingWindow.xaml              | 23 -------------------
 .../ViewModel/SettingWindowViewModel.cs       |  6 -----
 5 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
index cbe226e6b..8ecd6dc4b 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs
@@ -40,7 +40,6 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         public string ResultFontStretch { get; set; }
         public bool UseGlyphIcons { get; set; } = true;
         public bool UseAnimation { get; set; } = true;
-        public bool SubtitleHighlight { get; set; } = false;
         public bool UseSound { get; set; } = true;
         public bool FirstLaunch { get; set; } = true;
 
diff --git a/Flow.Launcher/Converters/HighlightTextConverter.cs b/Flow.Launcher/Converters/HighlightTextConverter.cs
index d969081d4..972dd1bc8 100644
--- a/Flow.Launcher/Converters/HighlightTextConverter.cs
+++ b/Flow.Launcher/Converters/HighlightTextConverter.cs
@@ -8,15 +8,11 @@ using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Documents;
-using Flow.Launcher.Infrastructure.UserSettings;
-using Flow.Launcher.Core.Resource;
 
 namespace Flow.Launcher.Converters
 {
     public class HighlightTextConverter : IMultiValueConverter
     {
-        public Settings Settings { get;}
-        Settings settings = new Settings();
         public object Convert(object[] value, Type targetType, object parameter, CultureInfo cultureInfo)
         {
             var text = value[0] as string;
@@ -35,14 +31,8 @@ namespace Flow.Launcher.Converters
                 var currentCharacter = text.Substring(i, 1);
                 if (this.ShouldHighlight(highlightData, i))
                 {
-                    System.Diagnostics.Debug.WriteLine(settings.SubtitleHighlight);
-                    if (settings.SubtitleHighlight == true)
-                    { 
+
                     textBlock.Inlines.Add(new Run(currentCharacter) { Style = (Style)Application.Current.FindResource("HighlightStyle") });
-                    }
-                    else
-                    {
-                    }
 
                 }
                 else
@@ -62,6 +52,5 @@ namespace Flow.Launcher.Converters
         {
             return highlightData.Contains(index);
         }
-
     }
 }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index e312ccf0b..e11cbd5cb 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -90,7 +90,6 @@
     <system:String x:Key="ThemeFolder">Theme Folder</system:String>
     <system:String x:Key="OpenThemeFolder">Open Theme Folder</system:String>
     <system:String x:Key="ColorScheme">Color Scheme</system:String>
-    <system:String x:Key="SubtitleHihglight">Subtitle Highlight</system:String>
     <system:String x:Key="ColorSchemeSystem">System Default</system:String>
     <system:String x:Key="ColorSchemeLight">Light</system:String>
     <system:String x:Key="ColorSchemeDark">Dark</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 91067bdcd..d8c94390b 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1937,29 +1937,6 @@
                                                         </TextBlock>
                                                     </ItemsControl>
                                                 </Border>
-                                                <Separator
-                                                    Width="Auto"
-                                                    BorderThickness="1"
-                                                    Style="{StaticResource SettingSeparatorStyle}" />
-                                                <Border
-                                                    Margin="0,0,0,0"
-                                                    BorderThickness="0"
-                                                    Style="{DynamicResource SettingGroupBox}">
-                                                    <ItemsControl Style="{StaticResource SettingGrid}">
-                                                        <StackPanel Style="{StaticResource TextPanel}">
-                                                            <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SubtitleHihglight}" />
-                                                        </StackPanel>
-                                                        <ui:ToggleSwitch
-                                                            Grid.Row="0"
-                                                            Grid.Column="2"
-                                                            Width="100"
-                                                            Margin="0,0,2,0"
-                                                            IsOn="{Binding SubtitleHighlight, Mode=TwoWay}" />
-                                                        <TextBlock Style="{StaticResource Glyph}">
-                                                            &#xea80;
-                                                        </TextBlock>
-                                                    </ItemsControl>
-                                                </Border>
                                             </StackPanel>
                                         </Border>
 
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index 3f4e82611..342c85da2 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -356,18 +356,12 @@ namespace Flow.Launcher.ViewModel
             set => Settings.UseAnimation = value;
         }
 
-
         public bool UseSound
         {
             get => Settings.UseSound;
             set => Settings.UseSound = value;
         }
 
-        public bool SubtitleHighlight
-        {
-            get => Settings.SubtitleHighlight;
-            set => Settings.SubtitleHighlight = value;
-        }
         public Brush PreviewBackground
         {
             get