diff --git a/Cargo.lock b/Cargo.lock index 8f8e807..f375cf2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1157,7 +1157,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1176,7 +1176,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "quote", "syn 1.0.109", @@ -1185,7 +1185,7 @@ dependencies = [ [[package]] name = "cosmic-freedesktop-icons" version = "0.3.0" -source = "git+https://github.com/pop-os/freedesktop-icons#6bf0b5794b8aa37703c382c7586a5c799bad228c" +source = "git+https://github.com/pop-os/freedesktop-icons#98f78d49022c893be2e974e95d95aaea963a6833" dependencies = [ "dirs", "ini_core", @@ -1211,8 +1211,8 @@ dependencies = [ [[package]] name = "cosmic-text" -version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#9125dd48b771e9aa7833d106a9850e935f71eaa6" +version = "0.13.2" +source = "git+https://github.com/pop-os/cosmic-text.git#500a8fc6d172de5c9e08c6013070b6b7fcdf79dd" dependencies = [ "bitflags 2.8.0", "fontdb 0.16.2", @@ -1234,7 +1234,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "almost", "cosmic-config", @@ -2518,7 +2518,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "dnd", "iced_accessibility", @@ -2536,7 +2536,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "accesskit", "accesskit_winit", @@ -2545,7 +2545,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "bitflags 2.8.0", "bytes", @@ -2569,7 +2569,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "futures", "iced_core", @@ -2595,7 +2595,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "bitflags 2.8.0", "bytemuck", @@ -2617,7 +2617,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2629,7 +2629,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "bytes", "cosmic-client-toolkit", @@ -2644,7 +2644,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "bytemuck", "cosmic-text", @@ -2660,7 +2660,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "as-raw-xcb-connection", "bitflags 2.8.0", @@ -2691,7 +2691,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -2709,7 +2709,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "cosmic-client-toolkit", "dnd", @@ -3164,7 +3164,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" +source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f" dependencies = [ "apply", "ashpd 0.9.2", @@ -5864,7 +5864,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/src/main.rs b/src/main.rs index 497448a..7b98493 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,8 +10,8 @@ use cctk::{ }; use clap::Parser; use cosmic::{ - app::{Application, CosmicFlags, DbusActivationDetails, Message}, - cctk, + app::{Application, CosmicFlags}, + cctk, dbus_activation, iced::{ self, event::wayland::{Event as WaylandEvent, LayerEvent, OutputEvent}, @@ -198,7 +198,7 @@ impl App { self.toplevels.iter_mut().find(|i| &i.handle == handle) } - fn create_surface(&mut self, output: wl_output::WlOutput) -> Task> { + fn create_surface(&mut self, output: wl_output::WlOutput) -> Task> { let id = SurfaceId::unique(); self.layer_surfaces.insert( id, @@ -218,7 +218,7 @@ impl App { }) } - fn destroy_surface(&mut self, output: &wl_output::WlOutput) -> Task> { + fn destroy_surface(&mut self, output: &wl_output::WlOutput) -> Task> { if let Some((id, _)) = self .layer_surfaces .iter() @@ -231,7 +231,7 @@ impl App { } } - fn toggle(&mut self) -> Task> { + fn toggle(&mut self) -> Task> { if self.visible { self.hide() } else { @@ -239,7 +239,7 @@ impl App { } } - fn show(&mut self) -> Task> { + fn show(&mut self) -> Task> { if !self.visible { self.visible = true; let outputs = self.outputs.clone(); @@ -258,7 +258,7 @@ impl App { } // Close all shell surfaces - fn hide(&mut self) -> Task> { + fn hide(&mut self) -> Task> { self.visible = false; self.update_capture_filter(); self.drag_surface = None; @@ -298,7 +298,7 @@ impl Application for App { type Flags = Args; const APP_ID: &'static str = "com.system76.CosmicWorkspaces"; - fn init(core: cosmic::app::Core, _flags: Self::Flags) -> (Self, Task>) { + fn init(core: cosmic::app::Core, _flags: Self::Flags) -> (Self, Task>) { ( Self { core, @@ -309,7 +309,7 @@ impl Application for App { } // TODO: show panel and dock? Drag? - fn update(&mut self, message: Msg) -> Task> { + fn update(&mut self, message: Msg) -> Task> { match message { Msg::SourceFinished => { self.drag_surface = None; @@ -411,7 +411,7 @@ impl Application for App { desktop_info::icon_for_app_id(app_id.clone()), move |path| Msg::UpdateToplevelIcon(app_id.clone(), path), ) - .map(cosmic::app::Message::App); + .map(cosmic::Action::App); self.toplevels.push(Toplevel { icon: None, handle, @@ -436,7 +436,7 @@ impl Application for App { desktop_info::icon_for_app_id(app_id.clone()), move |path| Msg::UpdateToplevelIcon(app_id.clone(), path), ) - .map(cosmic::app::Message::App); + .map(cosmic::Action::App); } toplevel.info = info; return task; @@ -622,11 +622,8 @@ impl Application for App { Task::none() } - fn dbus_activation( - &mut self, - msg: cosmic::app::DbusActivationMessage, - ) -> Task> { - if let DbusActivationDetails::Activate = msg.msg { + fn dbus_activation(&mut self, msg: dbus_activation::Message) -> Task> { + if let dbus_activation::Details::Activate = msg.msg { self.toggle() } else { Task::none()