From 4b0e73fca4bfc526c8acba4ab055aad622f8534a Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Mon, 24 Feb 2025 14:39:43 -0500 Subject: [PATCH] update libcosmic --- Cargo.lock | 30 +++++++++++++++--------------- src/greeter.rs | 8 ++++---- src/locker.rs | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b73a07e..e8b16f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1072,7 +1072,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "atomicwrites", "calloop 0.14.1", @@ -1095,7 +1095,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "quote", "syn 1.0.109", @@ -1239,7 +1239,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "almost", "cosmic-config", @@ -2525,7 +2525,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "dnd", "iced_accessibility", @@ -2543,7 +2543,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "accesskit", "accesskit_winit", @@ -2552,7 +2552,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "bitflags 2.6.0", "bytes", @@ -2576,7 +2576,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "futures", "iced_core", @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2624,7 +2624,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2636,7 +2636,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -2651,7 +2651,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "bytemuck", "cosmic-text", @@ -2667,7 +2667,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -2698,7 +2698,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -2716,7 +2716,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3179,7 +3179,7 @@ checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#f270bc2b4e331c9e59a7ff39b190314d319d0325" +source = "git+https://github.com/pop-os/libcosmic//?branch=drop-menu-tree-changes#923cfaa496f0eccc3f477c5bc747fbc47b98f204" dependencies = [ "apply", "ashpd 0.9.2", diff --git a/src/greeter.rs b/src/greeter.rs index 681acf7..c7eabe0 100644 --- a/src/greeter.rs +++ b/src/greeter.rs @@ -7,7 +7,7 @@ use cosmic::app::{message, Core, Settings, Task}; use cosmic::iced::{Point, Size}; use cosmic::iced_core::{image, window}; use cosmic::iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings; -use cosmic::surface_message::{MessageWrapper, SurfaceMessage, SurfaceMessageHandler}; +use cosmic::surface_message::{MessageWrapper, SurfaceMessage}; use cosmic::widget::text; use cosmic::{ cosmic_config::{self, ConfigSet, CosmicConfigEntry}, @@ -389,9 +389,9 @@ struct NameIndexPair { data_idx: Option, } -impl SurfaceMessageHandler for Message { - fn to_surface_message(self) -> MessageWrapper { - match self { +impl From for MessageWrapper { + fn from(value: Message) -> Self { + match value { Message::Surface(msg) => MessageWrapper::Surface(msg), msg => MessageWrapper::Message(msg), } diff --git a/src/locker.rs b/src/locker.rs index 397f7f8..3a66d43 100644 --- a/src/locker.rs +++ b/src/locker.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-only use cosmic::app::{message, Core, Settings, Task}; -use cosmic::surface_message::{MessageWrapper, SurfaceMessage, SurfaceMessageHandler}; +use cosmic::surface_message::{MessageWrapper, SurfaceMessage}; use cosmic::{ executor, iced::{ @@ -207,9 +207,9 @@ pub struct Flags { wallpapers: Vec<(String, cosmic_bg_config::Source)>, } -impl SurfaceMessageHandler for Message { - fn to_surface_message(self) -> MessageWrapper { - match self { +impl From for MessageWrapper { + fn from(value: Message) -> Self { + match value { Message::Surface(msg) => MessageWrapper::Surface(msg), msg => MessageWrapper::Message(msg), }