Merge pull request #890 from onesounds/RemovePathHighlight

Remove Subtitle Highlight

Author: jjw24

Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

@@ -14,10 +14,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>2.1.0</Version>
-    <PackageVersion>2.1.0</PackageVersion>
-    <AssemblyVersion>2.1.0</AssemblyVersion>
-    <FileVersion>2.1.0</FileVersion>
+    <Version>2.1.1</Version>
+    <PackageVersion>2.1.1</PackageVersion>
+    <AssemblyVersion>2.1.1</AssemblyVersion>
+    <FileVersion>2.1.1</FileVersion>
     <PackageId>Flow.Launcher.Plugin</PackageId>
     <Authors>Flow-Launcher</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

Flow.Launcher.Plugin/Result.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Windows.Media;
@@ -77,9 +77,7 @@ public string IcoPath
         /// </summary>
         public IList<int> TitleHighlightData { get; set; }
 
-        /// <summary>
-        /// A list of indexes for the characters to be highlighted in SubTitle
-        /// </summary>
+        [Obsolete("Deprecated as of Flow Launcher v1.9.1. Subtitle highlighting is no longer offered")]
         public IList<int> SubTitleHighlightData { get; set; }
 
         /// <summary>
@@ -110,8 +108,7 @@ public override bool Equals(object obj)
             var equality = string.Equals(r?.Title, Title) &&
                            string.Equals(r?.SubTitle, SubTitle) &&
                            string.Equals(r?.IcoPath, IcoPath) &&
-                           TitleHighlightData == r.TitleHighlightData &&
-                           SubTitleHighlightData == r.SubTitleHighlightData;
+                           TitleHighlightData == r.TitleHighlightData;
 
             return equality;
         }

Flow.Launcher/ResultListBox.xaml

@@ -133,12 +133,7 @@
                                 Style="{DynamicResource ItemSubTitleStyle}"
                                 Text="{Binding Result.SubTitle}"
                                 ToolTip="{Binding ShowSubTitleToolTip}">
-                                <vm:ResultsViewModel.FormattedText>
-                                    <MultiBinding Converter="{StaticResource HighlightTextConverter}">
-                                        <Binding Path="Result.SubTitle" />
-                                        <Binding Path="Result.SubTitleHighlightData" />
-                                    </MultiBinding>
-                                </vm:ResultsViewModel.FormattedText>
+                    
                             </TextBlock>
 
                         </Grid>

Plugins/Flow.Launcher.Plugin.Sys/Main.cs

@@ -66,14 +66,9 @@ public List<Result> Query(Query query)
                 if (score > 0)
                 {
                     c.Score = score;
+
                     if (score == titleMatch.Score)
-                    {
                         c.TitleHighlightData = titleMatch.MatchData;
-                    }
-                    else
-                    {
-                        c.SubTitleHighlightData = subTitleMatch.MatchData;
-                    }
 
                     results.Add(c);
                 }

Plugins/Flow.Launcher.Plugin.Sys/plugin.json

@@ -4,7 +4,7 @@
   "Name": "System Commands",
   "Description": "Provide System related commands. e.g. shutdown,lock, setting etc.",
   "Author": "qianlifeng",
-  "Version": "1.6.0",
+  "Version": "1.6.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",

Plugins/Flow.Launcher.Plugin.WindowsSettings/Helper/ResultHelper.cs

@@ -54,7 +54,6 @@ internal static List<Result> GetResultList(
                     if (areaMatch.IsSearchPrecisionScoreMet())
                     {
                         var settingResult = NewSettingResult(areaMatch.Score + midScore, entry.Type);
-                        settingResult.SubTitleHighlightData = areaMatch.MatchData.Select(x => x + 6).ToList();
                         result = settingResult;
                     }
                     else