leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: lowercase startup_wm_class, name fallbacks

Browse source
This commit is contained in:
Ryan Brue 2024-03-10 14:02:51 -05:00 • committed by Ashley Wulber
parent ef050d5b05
commit cbda93a514
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/desktop.rs
View file

@ -76,9 +76,19 @@ pub fn load_applications_for_app_ids<'a, 'b>(
) -> Vec<DesktopEntryData> { ) -> Vec<DesktopEntryData> {
let mut app_ids = app_ids.collect::<Vec<_>>(); let mut app_ids = app_ids.collect::<Vec<_>>();
let mut applications = load_applications_filtered(locale, |de| { let mut applications = load_applications_filtered(locale, |de| {
if let Some(i) = app_ids // If appid matches, or startup_wm_class matches...
if let Some(i) = app_ids.iter().position(|id| {
id == &de.appid
|| id
.to_lowercase()
.eq(&de.startup_wm_class().unwrap_or_default().to_lowercase())
}) {
app_ids.remove(i);
true
// Fallback: If the name matches...
} else if let Some(i) = app_ids
.iter() .iter()
.position(|id| id == &de.appid || id.eq(&de.startup_wm_class().unwrap_or_default())) .position(|id| id.to_lowercase().eq(&de.name().to_lowercase()))
{ {
app_ids.remove(i); app_ids.remove(i);
true true