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

Update for toplevel-info cctk changes

Browse source 
Requires pop-os/cosmic-protocols#49.

The duplication between applets, and
cosmic-workspace/xdg-desktop-portal-cosmic, should be moved to shared
abstractions. But that can be done after moving to
`ext-image-copy-capture`.

`ToplevelInfo` now contains both ext and cosmic handles, so the tuples
of handles and info are needed. Use just the info.
This commit is contained in:
Ian Douglas Scott 2025-02-12 10:42:32 -08:00 • committed by Ian Douglas Scott
parent 69fd2b62df
commit e9848a2d4f
9 changed files with 218 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cosmic-applet-tiling/src/wayland.rs
View file

@ -11,13 +11,11 @@ use cctk::{
},
toplevel_info::{ToplevelInfoHandler, ToplevelInfoState},
wayland_client::WEnum,
wayland_protocols::ext::foreign_toplevel_list::v1::client::ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1,
workspace::{WorkspaceHandler, WorkspaceState},
};
use cosmic::iced::futures;
use cosmic_protocols::{
toplevel_info::v1::client::zcosmic_toplevel_handle_v1,
workspace::v1::client::zcosmic_workspace_handle_v1::{self, TilingState},
};
use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1::{self, TilingState};
use futures::{channel::mpsc, executor::block_on, SinkExt};
use std::{
collections::HashSet,
@ -274,7 +272,7 @@ impl ToplevelInfoHandler for State {
&mut self,
_conn: &Connection,
_qh: &QueueHandle<Self>,
toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
toplevel: &ExtForeignToplevelHandleV1,
) {
let Some(w) = self
.toplevel_info_state
@ -290,7 +288,7 @@ impl ToplevelInfoHandler for State {
&mut self,
_conn: &Connection,
_qh: &QueueHandle<Self>,
toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
toplevel: &ExtForeignToplevelHandleV1,
) {
let Some(w) = self
.toplevel_info_state
@ -306,7 +304,7 @@ impl ToplevelInfoHandler for State {
&mut self,
_conn: &Connection,
_qh: &QueueHandle<Self>,
_toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1,
_toplevel: &ExtForeignToplevelHandleV1,
) {
}
}