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

chore: update libcosmic

Browse source
This commit is contained in:
Ian Douglas Scott 2025-03-11 15:29:30 -07:00 • committed by Ian Douglas Scott
parent 6b6bf454db
commit a9dcdce525
2 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Cargo.lock generated
View file

@ -1157,7 +1157,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -1176,7 +1176,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -1185,7 +1185,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-freedesktop-icons" name = "cosmic-freedesktop-icons"
version = "0.3.0" 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 = [ dependencies = [
"dirs", "dirs",
"ini_core", "ini_core",
@ -1211,8 +1211,8 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-text" name = "cosmic-text"
version = "0.12.1" version = "0.13.2"
source = "git+https://github.com/pop-os/cosmic-text.git#9125dd48b771e9aa7833d106a9850e935f71eaa6" source = "git+https://github.com/pop-os/cosmic-text.git#500a8fc6d172de5c9e08c6013070b6b7fcdf79dd"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"fontdb 0.16.2", "fontdb 0.16.2",
@ -1234,7 +1234,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -2518,7 +2518,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -2536,7 +2536,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -2545,7 +2545,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"bytes", "bytes",
@ -2569,7 +2569,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -2595,7 +2595,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"bytemuck", "bytemuck",
@ -2617,7 +2617,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -2629,7 +2629,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"bytes", "bytes",
"cosmic-client-toolkit", "cosmic-client-toolkit",
@ -2644,7 +2644,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -2660,7 +2660,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"as-raw-xcb-connection", "as-raw-xcb-connection",
"bitflags 2.8.0", "bitflags 2.8.0",
@ -2691,7 +2691,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -2709,7 +2709,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#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"cosmic-client-toolkit", "cosmic-client-toolkit",
"dnd", "dnd",
@ -3164,7 +3164,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#0b7e23444afb3f351cd947c52babb6b87f30381d" source = "git+https://github.com/pop-os/libcosmic#337b80d4ca02a63631668212bccbace22b8bb49f"
dependencies = [ dependencies = [
"apply", "apply",
"ashpd 0.9.2", "ashpd 0.9.2",
@ -5864,7 +5864,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
dependencies = [ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.59.0",
] ]
[[package]] [[package]]

29
src/main.rs
View file

@ -10,8 +10,8 @@ use cctk::{
}; };
use clap::Parser; use clap::Parser;
use cosmic::{ use cosmic::{
app::{Application, CosmicFlags, DbusActivationDetails, Message}, app::{Application, CosmicFlags},
cctk, cctk, dbus_activation,
iced::{ iced::{
self, self,
event::wayland::{Event as WaylandEvent, LayerEvent, OutputEvent}, event::wayland::{Event as WaylandEvent, LayerEvent, OutputEvent},
@ -198,7 +198,7 @@ impl App {
self.toplevels.iter_mut().find(|i| &i.handle == handle) self.toplevels.iter_mut().find(|i| &i.handle == handle)
} }
fn create_surface(&mut self, output: wl_output::WlOutput) -> Task<cosmic::app::Message<Msg>> { fn create_surface(&mut self, output: wl_output::WlOutput) -> Task<cosmic::Action<Msg>> {
let id = SurfaceId::unique(); let id = SurfaceId::unique();
self.layer_surfaces.insert( self.layer_surfaces.insert(
id, id,
@ -218,7 +218,7 @@ impl App {
}) })
} }
fn destroy_surface(&mut self, output: &wl_output::WlOutput) -> Task<cosmic::app::Message<Msg>> { fn destroy_surface(&mut self, output: &wl_output::WlOutput) -> Task<cosmic::Action<Msg>> {
if let Some((id, _)) = self if let Some((id, _)) = self
.layer_surfaces .layer_surfaces
.iter() .iter()
@ -231,7 +231,7 @@ impl App {
} }
} }
fn toggle(&mut self) -> Task<cosmic::app::Message<Msg>> { fn toggle(&mut self) -> Task<cosmic::Action<Msg>> {
if self.visible { if self.visible {
self.hide() self.hide()
} else { } else {
@ -239,7 +239,7 @@ impl App {
} }
} }
fn show(&mut self) -> Task<cosmic::app::Message<Msg>> { fn show(&mut self) -> Task<cosmic::Action<Msg>> {
if !self.visible { if !self.visible {
self.visible = true; self.visible = true;
let outputs = self.outputs.clone(); let outputs = self.outputs.clone();
@ -258,7 +258,7 @@ impl App {
} }
// Close all shell surfaces // Close all shell surfaces
fn hide(&mut self) -> Task<cosmic::app::Message<Msg>> { fn hide(&mut self) -> Task<cosmic::Action<Msg>> {
self.visible = false; self.visible = false;
self.update_capture_filter(); self.update_capture_filter();
self.drag_surface = None; self.drag_surface = None;
@ -298,7 +298,7 @@ impl Application for App {
type Flags = Args; type Flags = Args;
const APP_ID: &'static str = "com.system76.CosmicWorkspaces"; const APP_ID: &'static str = "com.system76.CosmicWorkspaces";
fn init(core: cosmic::app::Core, _flags: Self::Flags) -> (Self, Task<Message<Self::Message>>) { fn init(core: cosmic::app::Core, _flags: Self::Flags) -> (Self, Task<cosmic::Action<Msg>>) {
( (
Self { Self {
core, core,
@ -309,7 +309,7 @@ impl Application for App {
} }
// TODO: show panel and dock? Drag? // TODO: show panel and dock? Drag?
fn update(&mut self, message: Msg) -> Task<cosmic::app::Message<Msg>> { fn update(&mut self, message: Msg) -> Task<cosmic::Action<Msg>> {
match message { match message {
Msg::SourceFinished => { Msg::SourceFinished => {
self.drag_surface = None; self.drag_surface = None;
@ -411,7 +411,7 @@ impl Application for App {
desktop_info::icon_for_app_id(app_id.clone()), desktop_info::icon_for_app_id(app_id.clone()),
move |path| Msg::UpdateToplevelIcon(app_id.clone(), path), move |path| Msg::UpdateToplevelIcon(app_id.clone(), path),
) )
.map(cosmic::app::Message::App); .map(cosmic::Action::App);
self.toplevels.push(Toplevel { self.toplevels.push(Toplevel {
icon: None, icon: None,
handle, handle,
@ -436,7 +436,7 @@ impl Application for App {
desktop_info::icon_for_app_id(app_id.clone()), desktop_info::icon_for_app_id(app_id.clone()),
move |path| Msg::UpdateToplevelIcon(app_id.clone(), path), move |path| Msg::UpdateToplevelIcon(app_id.clone(), path),
) )
.map(cosmic::app::Message::App); .map(cosmic::Action::App);
} }
toplevel.info = info; toplevel.info = info;
return task; return task;
@ -622,11 +622,8 @@ impl Application for App {
Task::none() Task::none()
} }
fn dbus_activation( fn dbus_activation(&mut self, msg: dbus_activation::Message) -> Task<cosmic::Action<Msg>> {
&mut self, if let dbus_activation::Details::Activate = msg.msg {
msg: cosmic::app::DbusActivationMessage,
) -> Task<cosmic::app::Message<Self::Message>> {
if let DbusActivationDetails::Activate = msg.msg {
self.toggle() self.toggle()
} else { } else {
Task::none() Task::none()