From d1ef35e4ac4be757424cd042a1117215dc562852 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.toml | 2 +- winit/src/platform_specific/wayland/handlers/toplevel.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 886e30e79a..47412f7f52 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -197,7 +197,7 @@ pulldown-cmark = "0.11" qrcode = { version = "0.13", default-features = false } raw-window-handle = "0.6" rustc-hash = "2.0" -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" } smol = "1.0" smol_str = "0.2" softbuffer = { git = "https://github.com/pop-os/softbuffer", tag = "cosmic-4.0" } diff --git a/winit/src/platform_specific/wayland/handlers/toplevel.rs b/winit/src/platform_specific/wayland/handlers/toplevel.rs index f9146987d9..6ff1c3e0e5 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 }