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

Update dependencies

Browse source
This commit is contained in:
Ian Douglas Scott 2025-01-13 10:42:44 -08:00
parent b70828e23f
commit e1895ea3d7
4 changed files with 105 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/backend/wayland/buffer.rs
View file

@ -131,11 +131,11 @@ impl AppData {
let mut planes = Vec::new();
let params = self.dmabuf_state.create_params(&self.qh)?;
let modifier = bo.modifier()?;
for i in 0..bo.plane_count()? as i32 {
let modifier = bo.modifier();
for i in 0..bo.plane_count() as i32 {
let plane_fd = bo.fd_for_plane(i)?;
let plane_offset = bo.offset(i)?;
let plane_stride = bo.stride_for_plane(i)?;
let plane_offset = bo.offset(i);
let plane_stride = bo.stride_for_plane(i);
params.add(
plane_fd.as_fd(),
i as u32,

12
src/desktop_info.rs
View file

@ -45,12 +45,13 @@ fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> {
let app_ids_clone = app_ids.clone();
let mut ret = freedesktop_desktop_entry::Iter::new(freedesktop_desktop_entry::default_paths())
.filter_map(|path| {
std::fs::read_to_string(&path).ok().and_then(|input| {
DesktopEntry::decode(&path, &input).ok().and_then(|de| {
DesktopEntry::from_path::<String>(path.clone(), None)
.ok()
.and_then(|de| {
if let Some(i) = app_ids.iter().position(|s| {
s == de.appid || s.eq(&de.startup_wm_class().unwrap_or_default())
*s == de.appid || s.eq(&de.startup_wm_class().unwrap_or_default())
}) {
let icon = freedesktop_icons::lookup(de.icon().unwrap_or(de.appid))
let icon = freedesktop_icons::lookup(de.icon().unwrap_or(&de.appid))
.with_size(128)
.with_cache()
.find()
@ -62,14 +63,13 @@ fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> {
wm_class: de.startup_wm_class().map(ToString::to_string),
icon,
exec: de.exec().unwrap_or_default().to_string(),
name: de.name(None).unwrap_or_default().to_string(),
name: de.name::<String>(&[]).unwrap_or_default().to_string(),
path: path.clone(),
})
} else {
None
}
})
})
})
.collect_vec();
ret.append(