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

chore: update libcosmic

Browse source
This commit is contained in:
Ashley Wulber 2024-03-11 17:47:34 -04:00 • committed by Ashley Wulber
parent 13dedfc3c7
commit ed049b1269
4 changed files with 40 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,6 @@ cctk.workspace = true
cosmic-protocols.workspace = true
libcosmic.workspace = true
zbus.workspace = true
# libcosmic = { path = "../../libcosmic", default-features = false, features = ["wayland", "tokio", "applet"] }
ron = "0.8"
futures = "0.3"
futures-util = "0.3"

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

@ -74,13 +74,18 @@ pub fn load_applications_for_app_ids_sorted<'a, 'b>(
app_ids: impl Iterator<Item = &'b str> + Clone,
fill_missing_ones: bool,
) -> Vec<DesktopEntryData> {
let mut ret = load_applications_for_app_ids(locale, app_ids.clone(), fill_missing_ones);
let mut ret = load_applications_for_app_ids(locale, app_ids.clone(), fill_missing_ones, false);
ret.sort_by(|a, b| {
app_ids
.clone()
.position(|id| id == a.id)
.unwrap()
.cmp(&app_ids.clone().position(|id| id == b.id).unwrap())
.position(|id| id == a.id || a.name.to_lowercase() == id.to_lowercase())
.unwrap_or(usize::MAX)
.cmp(
&app_ids
.clone()
.position(|id| id == b.id || b.name.to_lowercase() == id.to_lowercase())
.unwrap_or(usize::MAX),
)
});
ret