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

update libcosmic

Browse source
This commit is contained in:
Ashley Wulber 2025-02-24 14:39:43 -05:00 • committed by Jeremy Soller
parent 7918485651
commit 4b0e73fca4
3 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Cargo.lock generated
View file

@ -1072,7 +1072,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" 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 = [ dependencies = [
"atomicwrites", "atomicwrites",
"calloop 0.14.1", "calloop 0.14.1",
@ -1095,7 +1095,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" 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 = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -1239,7 +1239,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" 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 = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -2525,7 +2525,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.14.0-dev" 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 = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -2543,7 +2543,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" 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 = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -2552,7 +2552,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.14.0-dev" 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 = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"bytes", "bytes",
@ -2576,7 +2576,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.14.0-dev" 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 = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -2602,7 +2602,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.14.0-dev" 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 = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"bytemuck", "bytemuck",
@ -2624,7 +2624,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.14.0-dev" 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 = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -2636,7 +2636,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.14.0-dev" 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 = [ dependencies = [
"bytes", "bytes",
"cosmic-client-toolkit", "cosmic-client-toolkit",
@ -2651,7 +2651,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.14.0-dev" 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 = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -2667,7 +2667,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.14.0-dev" 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 = [ dependencies = [
"as-raw-xcb-connection", "as-raw-xcb-connection",
"bitflags 2.6.0", "bitflags 2.6.0",
@ -2698,7 +2698,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.14.0-dev" 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 = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -2716,7 +2716,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.14.0-dev" 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 = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -3179,7 +3179,7 @@ checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" 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 = [ dependencies = [
"apply", "apply",
"ashpd 0.9.2", "ashpd 0.9.2",

8
src/greeter.rs
View file

@ -7,7 +7,7 @@ use cosmic::app::{message, Core, Settings, Task};
use cosmic::iced::{Point, Size}; use cosmic::iced::{Point, Size};
use cosmic::iced_core::{image, window}; use cosmic::iced_core::{image, window};
use cosmic::iced_runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings; 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::widget::text;
use cosmic::{ use cosmic::{
cosmic_config::{self, ConfigSet, CosmicConfigEntry}, cosmic_config::{self, ConfigSet, CosmicConfigEntry},
@ -389,9 +389,9 @@ struct NameIndexPair {
data_idx: Option<usize>, data_idx: Option<usize>,
} }
impl SurfaceMessageHandler for Message { impl From<Message> for MessageWrapper<Message> {
fn to_surface_message(self) -> MessageWrapper<Self> { fn from(value: Message) -> Self {
match self { match value {
Message::Surface(msg) => MessageWrapper::Surface(msg), Message::Surface(msg) => MessageWrapper::Surface(msg),
msg => MessageWrapper::Message(msg), msg => MessageWrapper::Message(msg),
} }

8
src/locker.rs
View file

@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only // SPDX-License-Identifier: GPL-3.0-only
use cosmic::app::{message, Core, Settings, Task}; use cosmic::app::{message, Core, Settings, Task};
use cosmic::surface_message::{MessageWrapper, SurfaceMessage, SurfaceMessageHandler}; use cosmic::surface_message::{MessageWrapper, SurfaceMessage};
use cosmic::{ use cosmic::{
executor, executor,
iced::{ iced::{
@ -207,9 +207,9 @@ pub struct Flags {
wallpapers: Vec<(String, cosmic_bg_config::Source)>, wallpapers: Vec<(String, cosmic_bg_config::Source)>,
} }
impl SurfaceMessageHandler for Message { impl From<Message> for MessageWrapper<Message> {
fn to_surface_message(self) -> MessageWrapper<Self> { fn from(value: Message) -> Self {
match self { match value {
Message::Surface(msg) => MessageWrapper::Surface(msg), Message::Surface(msg) => MessageWrapper::Surface(msg),
msg => MessageWrapper::Message(msg), msg => MessageWrapper::Message(msg),
} }