diff --git a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs index 8ecd6dc4b..cbe226e6b 100644 --- a/Flow.Launcher.Infrastructure/UserSettings/Settings.cs +++ b/Flow.Launcher.Infrastructure/UserSettings/Settings.cs @@ -40,6 +40,7 @@ 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 972dd1bc8..d969081d4 100644 --- a/Flow.Launcher/Converters/HighlightTextConverter.cs +++ b/Flow.Launcher/Converters/HighlightTextConverter.cs @@ -8,11 +8,15 @@ 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; @@ -31,8 +35,14 @@ 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 @@ -52,5 +62,6 @@ namespace Flow.Launcher.Converters { return highlightData.Contains(index); } + } } diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index e11cbd5cb..e312ccf0b 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -90,6 +90,7 @@ Theme Folder Open Theme Folder Color Scheme + Subtitle Highlight System Default Light Dark diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index d8c94390b..91067bdcd 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -1937,6 +1937,29 @@ + + + + + + + + +  + + + diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 342c85da2..3f4e82611 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -356,12 +356,18 @@ 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