mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Merge pull request #1020 from Flow-Launcher/fix_win_settings_score
Fix WindowsSettings plugin result scores higher than normal
This commit is contained in:
commit
16e032ea55
2 changed files with 9 additions and 8 deletions
|
|
@ -34,8 +34,9 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper
|
||||||
var resultList = new List<Result>();
|
var resultList = new List<Result>();
|
||||||
foreach (var entry in list)
|
foreach (var entry in list)
|
||||||
{
|
{
|
||||||
const int highScore = 20;
|
// Adjust the score to lower the order of many irrelevant matches from area strings
|
||||||
const int midScore = 10;
|
// that may only be for description.
|
||||||
|
const int nonNameMatchScoreAdj = 10;
|
||||||
|
|
||||||
Result? result;
|
Result? result;
|
||||||
Debug.Assert(_api != null, nameof(_api) + " != null");
|
Debug.Assert(_api != null, nameof(_api) + " != null");
|
||||||
|
|
@ -44,7 +45,7 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper
|
||||||
|
|
||||||
if (nameMatch.IsSearchPrecisionScoreMet())
|
if (nameMatch.IsSearchPrecisionScoreMet())
|
||||||
{
|
{
|
||||||
var settingResult = NewSettingResult(nameMatch.Score + highScore, entry.Type);
|
var settingResult = NewSettingResult(nameMatch.Score, entry.Type);
|
||||||
settingResult.TitleHighlightData = nameMatch.MatchData;
|
settingResult.TitleHighlightData = nameMatch.MatchData;
|
||||||
result = settingResult;
|
result = settingResult;
|
||||||
}
|
}
|
||||||
|
|
@ -53,7 +54,7 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper
|
||||||
var areaMatch = _api.FuzzySearch(query.Search, entry.Area);
|
var areaMatch = _api.FuzzySearch(query.Search, entry.Area);
|
||||||
if (areaMatch.IsSearchPrecisionScoreMet())
|
if (areaMatch.IsSearchPrecisionScoreMet())
|
||||||
{
|
{
|
||||||
var settingResult = NewSettingResult(areaMatch.Score + midScore, entry.Type);
|
var settingResult = NewSettingResult(areaMatch.Score - nonNameMatchScoreAdj, entry.Type);
|
||||||
result = settingResult;
|
result = settingResult;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -61,7 +62,7 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper
|
||||||
result = entry.AltNames?
|
result = entry.AltNames?
|
||||||
.Select(altName => _api.FuzzySearch(query.Search, altName))
|
.Select(altName => _api.FuzzySearch(query.Search, altName))
|
||||||
.Where(match => match.IsSearchPrecisionScoreMet())
|
.Where(match => match.IsSearchPrecisionScoreMet())
|
||||||
.Select(altNameMatch => NewSettingResult(altNameMatch.Score + midScore, entry.Type))
|
.Select(altNameMatch => NewSettingResult(altNameMatch.Score - nonNameMatchScoreAdj, entry.Type))
|
||||||
.FirstOrDefault();
|
.FirstOrDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -75,7 +76,7 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper
|
||||||
.SelectMany(x => x)
|
.SelectMany(x => x)
|
||||||
.Contains(x, StringComparer.CurrentCultureIgnoreCase))
|
.Contains(x, StringComparer.CurrentCultureIgnoreCase))
|
||||||
)
|
)
|
||||||
result = NewSettingResult(midScore, entry.Type);
|
result = NewSettingResult(nonNameMatchScoreAdj, entry.Type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -115,7 +116,7 @@ namespace Flow.Launcher.Plugin.WindowsSettings.Helper
|
||||||
private static void AddOptionalToolTip(WindowsSetting entry, Result result)
|
private static void AddOptionalToolTip(WindowsSetting entry, Result result)
|
||||||
{
|
{
|
||||||
var toolTipText = new StringBuilder();
|
var toolTipText = new StringBuilder();
|
||||||
|
|
||||||
var settingType = entry.Type == "AppSettingsApp" ? "System settings" : "Control Panel";
|
var settingType = entry.Type == "AppSettingsApp" ? "System settings" : "Control Panel";
|
||||||
|
|
||||||
toolTipText.AppendLine($"{Resources.Application}: {settingType}");
|
toolTipText.AppendLine($"{Resources.Application}: {settingType}");
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
"Description": "Search settings inside Control Panel and Settings App",
|
"Description": "Search settings inside Control Panel and Settings App",
|
||||||
"Name": "Windows Settings",
|
"Name": "Windows Settings",
|
||||||
"Author": "TobiasSekan",
|
"Author": "TobiasSekan",
|
||||||
"Version": "2.0.1",
|
"Version": "2.0.2",
|
||||||
"Language": "csharp",
|
"Language": "csharp",
|
||||||
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
|
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
|
||||||
"ExecuteFileName": "Flow.Launcher.Plugin.WindowsSettings.dll",
|
"ExecuteFileName": "Flow.Launcher.Plugin.WindowsSettings.dll",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue