From 49b154c048ed6841dc41e47457d1ffb26c848cb7 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Mon, 10 Feb 2025 14:22:06 -0800 Subject: [PATCH] winit/wayland: Update for toplevel-info cctk changes --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- winit/src/platform_specific/wayland/handlers/toplevel.rs | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f64646a..fa7803fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1283,7 +1283,7 @@ dependencies = [ [[package]] name = "cosmic-client-toolkit" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=29ab323#29ab32305c6457fccf0728caaaf79fcac4cca665" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=178eb0b#178eb0b14a0e5c192f64f6dee6c40341a8e5ee51" dependencies = [ "cosmic-protocols", "libc", @@ -1295,7 +1295,7 @@ dependencies = [ [[package]] name = "cosmic-protocols" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-protocols?rev=29ab323#29ab32305c6457fccf0728caaaf79fcac4cca665" +source = "git+https://github.com/pop-os/cosmic-protocols?rev=178eb0b#178eb0b14a0e5c192f64f6dee6c40341a8e5ee51" dependencies = [ "bitflags 2.10.0", "wayland-backend", diff --git a/Cargo.toml b/Cargo.toml index c751fba9..7a58d330 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -278,7 +278,7 @@ tiny-skia = { version = "0.11", default-features = false, features = [ "std", "simd", ] } -cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "29ab323" } +cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "178eb0b" } softbuffer = { git = "https://github.com/pop-os/softbuffer", tag = "cosmic-4.0" } syntect = "5.2" tokio = "1.0" diff --git a/winit/src/platform_specific/wayland/handlers/toplevel.rs b/winit/src/platform_specific/wayland/handlers/toplevel.rs index f9146987..6ff1c3e0 100644 --- a/winit/src/platform_specific/wayland/handlers/toplevel.rs +++ b/winit/src/platform_specific/wayland/handlers/toplevel.rs @@ -1,6 +1,5 @@ use cctk::{ cosmic_protocols::{ - toplevel_info::v1::client::zcosmic_toplevel_handle_v1, toplevel_management::v1::client::zcosmic_toplevel_manager_v1, }, toplevel_info::{ToplevelInfoHandler, ToplevelInfoState}, @@ -8,6 +7,7 @@ use cctk::{ wayland_client::{self, WEnum}, }; use wayland_client::{Connection, QueueHandle}; +use wayland_protocols::ext::foreign_toplevel_list::v1::client::ext_foreign_toplevel_handle_v1; use crate::event_loop::state::SctkState; @@ -39,7 +39,7 @@ impl ToplevelInfoHandler for SctkState { &mut self, _conn: &Connection, _qh: &QueueHandle, - _toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1, + _toplevel: &ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1, ) { // TODO } @@ -48,7 +48,7 @@ impl ToplevelInfoHandler for SctkState { &mut self, _conn: &Connection, _qh: &QueueHandle, - _toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1, + _toplevel: &ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1, ) { // TODO } @@ -57,7 +57,7 @@ impl ToplevelInfoHandler for SctkState { &mut self, _conn: &Connection, _qh: &QueueHandle, - _toplevel: &zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1, + _toplevel: &ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1, ) { // TODO }