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

chore: adapt to changes in libcosmic

Browse source
This commit is contained in:
Hojjat 2026-09-10 16:17:36 -06:00 • committed by Michael Murphy
parent b933e538c0
commit e01b16f4a2
16 changed files with 51 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Cargo.lock generated
View file

@ -651,7 +651,7 @@ dependencies = [
[[package]]
name = "build_helpers"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"cfg_aliases",
]
@ -1304,7 +1304,7 @@ dependencies = [
[[package]]
name = "cosmic-config"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"atomicwrites",
"cosmic-config-derive",
@ -1325,7 +1325,7 @@ dependencies = [
[[package]]
name = "cosmic-config-derive"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"quote",
"syn",
@ -1392,7 +1392,7 @@ dependencies = [
[[package]]
name = "cosmic-panel-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#f664a34c788f09689be9efa88e41040d7e6361f1"
source = "git+https://github.com/pop-os/cosmic-panel#e6e6442d762291beeb908bb7dd8a2cefff8eb7d3"
dependencies = [
"anyhow",
"cosmic-config",
@ -1546,7 +1546,7 @@ dependencies = [
[[package]]
name = "cosmic-theme"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"almost",
"configparser",
@ -2880,7 +2880,7 @@ dependencies = [
[[package]]
name = "iced"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"build_helpers",
"dnd",
@ -2902,7 +2902,7 @@ dependencies = [
[[package]]
name = "iced_accessibility"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"accesskit",
"accesskit_winit",
@ -2911,7 +2911,7 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"bitflags 2.13.0",
"build_helpers",
@ -2937,7 +2937,7 @@ dependencies = [
[[package]]
name = "iced_debug"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"iced_core",
"iced_futures",
@ -2947,7 +2947,7 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"futures",
"iced_core",
@ -2961,7 +2961,7 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"bitflags 2.13.0",
"bytemuck",
@ -2982,7 +2982,7 @@ dependencies = [
[[package]]
name = "iced_program"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"iced_graphics",
"iced_runtime",
@ -2991,7 +2991,7 @@ dependencies = [
[[package]]
name = "iced_renderer"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@ -3003,7 +3003,7 @@ dependencies = [
[[package]]
name = "iced_runtime"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"build_helpers",
"bytes",
@ -3019,7 +3019,7 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"bytemuck",
"cosmic-text",
@ -3036,7 +3036,7 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"as-raw-xcb-connection",
"bitflags 2.13.0",
@ -3068,7 +3068,7 @@ dependencies = [
[[package]]
name = "iced_widget"
version = "0.14.2"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"build_helpers",
"cosmic-client-toolkit",
@ -3087,7 +3087,7 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"build_helpers",
"cosmic-client-toolkit",
@ -3915,7 +3915,7 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
[[package]]
name = "libcosmic"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#d4d71fd53e5ed6bd3a430089114dffa2da3cd498"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"apply",
"ashpd 0.12.3",
@ -3955,6 +3955,7 @@ dependencies = [
"phf 0.13.1",
"rfd",
"ron 0.12.2",
"roxmltree",
"rust-embed",
"rustix 1.1.4",
"serde",
@ -7901,7 +7902,7 @@ checksum = "2fb433233f2df9344722454bc7e96465c9d03bff9d77c248f9e7523fe79585b5"
[[package]]
name = "xdg-shell-wrapper-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#f664a34c788f09689be9efa88e41040d7e6361f1"
source = "git+https://github.com/pop-os/cosmic-panel#e6e6442d762291beeb908bb7dd8a2cefff8eb7d3"
dependencies = [
"serde",
"wayland-protocols-wlr",

6
cosmic-app-list/src/app.rs
View file

@ -420,7 +420,7 @@ enum Message {
ConfigUpdated(AppListConfig),
OpenFavorites,
OpenActive,
Surface(surface::Action),
Surface(surface::Action<Message>),
}
fn index_in_list(
@ -1745,9 +1745,7 @@ impl cosmic::Application for CosmicAppList {
}
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}

6
cosmic-applet-a11y/src/app.rs
View file

@ -64,7 +64,7 @@ enum Message {
OpenSettings,
DBusUpdate(accessibility::Response),
WaylandUpdate(WaylandUpdate),
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl cosmic::Application for CosmicA11yApplet {
@ -288,9 +288,7 @@ impl cosmic::Application for CosmicA11yApplet {
}
},
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
Task::none()

6
cosmic-applet-audio/src/lib.rs
View file

@ -149,7 +149,7 @@ pub enum Message {
SetSinkVolume(u32),
SetSourceVolume(u32),
Subscription(audio_client::Event),
Surface(surface::Action),
Surface(surface::Action<Message>),
ToggleMediaControlsInTopPanel(bool),
TogglePopup,
ToggleSinkMute,
@ -542,9 +542,7 @@ impl cosmic::Application for Audio {
}
},
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
Message::Client(client) => {
if let Some(client) = Arc::into_inner(client) {

6
cosmic-applet-battery/src/app.rs
View file

@ -212,7 +212,7 @@ enum Message {
OpenSettings,
SettingsDaemon(settings_daemon::Event),
ZbusConnection(zbus::Result<zbus::Connection>),
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl cosmic::Application for CosmicBatteryApplet {
@ -525,9 +525,7 @@ impl cosmic::Application for CosmicBatteryApplet {
}
},
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
Task::none()

6
cosmic-applet-bluetooth/src/app.rs
View file

@ -75,7 +75,7 @@ enum Message {
Token(TokenUpdate),
OpenSettings,
ToggleBluetooth(bool),
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl cosmic::Application for CosmicBluetoothApplet {
@ -303,9 +303,7 @@ impl cosmic::Application for CosmicBluetoothApplet {
}
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
self.update_icon();

6
cosmic-applet-input-sources/src/lib.rs
View file

@ -98,7 +98,7 @@ pub enum Message {
CompConfig(Box<CosmicCompConfig>),
SetActiveLayout(usize),
KeyboardSettings,
Surface(surface::Action),
Surface(surface::Action<Message>),
Rectangle(RectangleUpdate<u32>),
WaylandConnection(Backend),
Wayland(wayland::Event),
@ -190,9 +190,7 @@ impl cosmic::Application for Window {
}
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
Message::Rectangle(u) => match u {
RectangleUpdate::Rectangle(r) => {

6
cosmic-applet-minimize/src/lib.rs
View file

@ -126,7 +126,7 @@ enum Message {
Closed(window::Id),
OpenOverflowPopup,
CloseOverflowPopup,
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl cosmic::Application for Minimize {
@ -294,9 +294,7 @@ impl cosmic::Application for Minimize {
}
Message::CloseOverflowPopup => todo!(),
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
Task::none()

6
cosmic-applet-network/src/app.rs
View file

@ -1028,7 +1028,7 @@ pub(crate) enum Message {
FocusSecureInput,
NoOp,
#[allow(dead_code)] // required by `cosmic::applet` surface path; not always emitted
Surface(surface::Action),
Surface(surface::Action<Message>),
ActivateVpn(Arc<str>), // UUID of VPN to activate
DeactivateVpn(Arc<str>), // UUID of VPN to deactivate
VpnOperationFinished {
@ -1294,9 +1294,7 @@ impl cosmic::Application for CosmicNetworkApplet {
return Task::batch(vec![forget_task, reconnect_task]);
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
Message::ActivateVpn(uuid) => {
self.nm_state.pending_vpn = Some(PendingVpn {

6
cosmic-applet-notifications/src/lib.rs
View file

@ -78,7 +78,7 @@ enum Message {
CardsToggled(String, bool),
Token(TokenUpdate),
OpenSettings,
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl cosmic::Application for Notifications {
@ -367,9 +367,7 @@ impl cosmic::Application for Notifications {
}
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
self.update_icon();

6
cosmic-applet-power/src/lib.rs
View file

@ -82,7 +82,7 @@ enum Message {
Zbus(Result<(), zbus::Error>),
Closed(window::Id),
Token(TokenUpdate),
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl cosmic::Application for Power {
@ -202,9 +202,7 @@ impl cosmic::Application for Power {
}
},
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
Task::none()

6
cosmic-applet-status-area/src/components/app.rs
View file

@ -38,7 +38,7 @@ pub enum Msg {
TogglePopup(usize),
Hovered(Option<usize>),
WheelScrolled(ScrollDelta),
Surface(surface::Action),
Surface(surface::Action<Msg>),
ToggleOverflow,
HoveredOverflow,
Token(TokenUpdate),
@ -408,9 +408,7 @@ impl cosmic::Application for App {
scroll(id, menu.item.item_proxy().clone(), delta, orientation)
}
Msg::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
Msg::ToggleOverflow => {
if let Some(popup_id) = self.overflow_popup.take() {

6
cosmic-applet-tiling/src/window.rs
View file

@ -55,7 +55,7 @@ pub enum Message {
WorkspaceUpdate(WorkspacesUpdate),
NewWorkspace(Entity),
OpenSettings,
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl cosmic::Application for Window {
@ -234,9 +234,7 @@ impl cosmic::Application for Window {
tokio::spawn(cosmic::process::spawn(cmd));
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
Task::none()

6
cosmic-applet-time/src/window.rs
View file

@ -106,7 +106,7 @@ pub enum Message {
Token(TokenUpdate),
ConfigChanged(TimeAppletConfig),
TimezoneUpdate(String),
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl Window {
@ -673,9 +673,7 @@ impl cosmic::Application for Window {
self.update(Message::Tick)
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
}

6
cosmic-applet-workspaces/src/components/app.rs
View file

@ -89,7 +89,7 @@ enum Message {
WorkspacePressed(ExtWorkspaceHandleV1),
WheelScrolled(ScrollDelta),
WorkspaceOverview,
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl cosmic::Application for IcedWorkspacesApplet {
@ -166,9 +166,7 @@ impl cosmic::Application for IcedWorkspacesApplet {
let _ = ShellCommand::new("cosmic-workspaces").spawn();
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
Task::none()

6
cosmic-panel-button/src/lib.rs
View file

@ -39,7 +39,7 @@ struct Button {
enum Msg {
Press,
ConfigUpdated(CosmicPanelButtonConfig),
Surface(surface::Action),
Surface(surface::Action<Msg>),
}
impl Button {
@ -141,9 +141,7 @@ impl cosmic::Application for Button {
.unwrap_or_default();
}
Msg::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}
Task::none()