poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

core/desktopentry: prioritize fallback keys over mismatched keys

Browse source 
The fallback key will now be selected when there isn't a more specific
key to select, instead of the first key.
This commit is contained in:
outfoxxed 2024-08-28 22:05:21 -07:00
parent af29bc277e
commit a116f39c63
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/desktopentry.cpp
View file

@ -142,7 +142,7 @@ void DesktopEntry::parseEntry(const QString& text) {
auto splitIdx = line.indexOf(u'='); auto splitIdx = line.indexOf(u'=');
if (splitIdx == -1) { if (splitIdx == -1) {
qCDebug(logDesktopEntry) << "Encountered invalid line in desktop entry (no =)" << line; qCWarning(logDesktopEntry) << "Encountered invalid line in desktop entry (no =)" << line;
continue; continue;
} }
@ -159,7 +159,10 @@ void DesktopEntry::parseEntry(const QString& text) {
if (entries.contains(key)) { if (entries.contains(key)) {
const auto& old = entries.value(key); const auto& old = entries.value(key);
if (system.matchScore(locale) > system.matchScore(old.first)) { auto oldScore = system.matchScore(old.first);
auto newScore = system.matchScore(locale);
if (newScore > oldScore || (oldScore == 0 && !locale.isValid())) {
entries.insert(key, qMakePair(locale, value)); entries.insert(key, qMakePair(locale, value));
} }
} else { } else {