aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2025-11-04 19:04:56 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/desktopentry: don't match keys with wrong modifier or country

Browse source
This commit is contained in:
bbedward 2025-09-30 08:17:03 -04:00 • committed by outfoxxed
parent 8d2a2d3dd2
commit a94418f45d
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog/next.md
View file

@ -12,3 +12,4 @@
- Fixed a rare crash when disconnecting a monitor. - Fixed a rare crash when disconnecting a monitor.
- Fixed build issues preventing cross compilation from working. - Fixed build issues preventing cross compilation from working.
- Fixed dekstop entries with lower priority than a hidden entry not being hidden. - Fixed dekstop entries with lower priority than a hidden entry not being hidden.
- Fixed desktop entry keys with mismatched modifier or country not being discarded.

10
src/core/desktopentry.cpp
View file

@ -61,12 +61,14 @@ struct Locale {
[[nodiscard]] int matchScore(const Locale& other) const { [[nodiscard]] int matchScore(const Locale& other) const {
if (this->language != other.language) return 0; if (this->language != other.language) return 0;
auto territoryMatches = !this->territory.isEmpty() && this->territory == other.territory;
auto modifierMatches = !this->modifier.isEmpty() && this->modifier == other.modifier; if (!other.modifier.isEmpty() && this->modifier != other.modifier) return 0;
if (!other.territory.isEmpty() && this->territory != other.territory) return 0;
auto score = 1; auto score = 1;
if (territoryMatches) score += 2;
if (modifierMatches) score += 1; if (!other.territory.isEmpty()) score += 2;
if (!other.modifier.isEmpty()) score += 1;
return score; return score;
} }