leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #121 from pop-os/applist-fix-icons_jammy

Browse source 
Applist fix icons
This commit is contained in:
Victoria Brekenfeld 2023-09-21 20:57:40 +02:00 • committed by GitHub
commit 519466f00b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-app-list/Cargo.toml
View file

@ -23,7 +23,7 @@ log = "0.4"
tokio = { version = "1.17.0", features = ["sync", "rt", "rt-multi-thread", "macros", "process"] } tokio = { version = "1.17.0", features = ["sync", "rt", "rt-multi-thread", "macros", "process"] }
itertools = "*" itertools = "*"
freedesktop-desktop-entry = "0.5.0" freedesktop-desktop-entry = "0.5.0"
freedesktop-icons = "0.2.2" freedesktop-icons = "0.2.4"
i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] }
i18n-embed-fl = "0.6" i18n-embed-fl = "0.6"
rust-embed = "6.3" rust-embed = "6.3"

44
cosmic-app-list/src/app.rs
View file

@ -254,6 +254,14 @@ struct DesktopInfo {
path: PathBuf, path: PathBuf,
} }
fn default_app_icon() -> PathBuf {
freedesktop_icons::lookup("application-default")
.with_size(128)
.with_cache()
.find()
.unwrap_or_default()
}
fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> { fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> {
let app_ids_clone = app_ids.clone(); let app_ids_clone = app_ids.clone();
let mut ret = freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths()) let mut ret = freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
@ -264,17 +272,19 @@ fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> {
.iter() .iter()
.position(|s| s == de.appid || s.eq(&de.name(None).unwrap_or_default())) .position(|s| s == de.appid || s.eq(&de.name(None).unwrap_or_default()))
{ {
freedesktop_icons::lookup(de.icon().unwrap_or(de.appid)) let icon = freedesktop_icons::lookup(de.icon().unwrap_or(de.appid))
.with_size(128) .with_size(128)
.with_cache() .with_cache()
.find() .find()
.map(|buf| DesktopInfo { .unwrap_or_else(default_app_icon);
id: app_ids.remove(i),
icon: buf, Some(DesktopInfo {
exec: de.exec().unwrap_or_default().to_string(), id: app_ids.remove(i),
name: de.name(None).unwrap_or_default().to_string(), icon,
path: path.clone(), exec: de.exec().unwrap_or_default().to_string(),
}) name: de.name(None).unwrap_or_default().to_string(),
path: path.clone(),
})
} else { } else {
None None
} }
@ -287,6 +297,7 @@ fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> {
.into_iter() .into_iter()
.map(|id| DesktopInfo { .map(|id| DesktopInfo {
id, id,
icon: default_app_icon(),
..Default::default() ..Default::default()
}) })
.collect_vec(), .collect_vec(),
@ -603,17 +614,18 @@ impl cosmic::Application for CosmicAppList {
DesktopEntry::decode(&file_path, &input) DesktopEntry::decode(&file_path, &input)
.ok() .ok()
.and_then(|de| { .and_then(|de| {
freedesktop_icons::lookup(de.icon().unwrap_or(de.appid)) let icon = freedesktop_icons::lookup(de.icon().unwrap_or(de.appid))
.with_size(128) .with_size(128)
.with_cache() .with_cache()
.find() .find()
.map(|buf| DesktopInfo { .unwrap_or_else(default_app_icon);
id: de.id().to_string(), Some(DesktopInfo {
icon: buf, id: de.id().to_string(),
exec: de.exec().unwrap_or_default().to_string(), icon,
name: de.name(None).unwrap_or_default().to_string(), exec: de.exec().unwrap_or_default().to_string(),
path: file_path.clone(), name: de.name(None).unwrap_or_default().to_string(),
}) path: file_path.clone(),
})
}) })
}) { }) {
self.item_ctr += 1; self.item_ctr += 1;