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

chore: adapt to the new libcosmic changes for Surface Action

Browse source
This commit is contained in:
Hojjat 2026-09-10 16:00:14 -06:00 • committed by Michael Murphy
parent 3cb538f759
commit bf920be39d
16 changed files with 48 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

63
Cargo.lock generated
View file

@ -278,7 +278,7 @@ version = "1.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
dependencies = [
"windows-sys 0.60.2",
"windows-sys 0.61.2",
]
[[package]]
@ -289,7 +289,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
dependencies = [
"anstyle",
"once_cell_polyfill",
"windows-sys 0.60.2",
"windows-sys 0.61.2",
]
[[package]]
@ -899,7 +899,7 @@ dependencies = [
[[package]]
name = "build_helpers"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"cfg_aliases 0.2.2",
]
@ -1393,7 +1393,7 @@ dependencies = [
[[package]]
name = "cosmic-config"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"atomicwrites",
"cosmic-config-derive",
@ -1414,7 +1414,7 @@ dependencies = [
[[package]]
name = "cosmic-config-derive"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"quote",
"syn 2.0.119",
@ -1681,7 +1681,7 @@ dependencies = [
[[package]]
name = "cosmic-settings-config"
version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-settings-daemon#617af3feb74dcf551a7c99b2396b4c9ac22568b3"
source = "git+https://github.com/pop-os/cosmic-settings-daemon#67c995d5e659173352ca0adfb22108ac1bf91f5a"
dependencies = [
"cosmic-config",
"ron 0.11.0",
@ -1803,7 +1803,7 @@ dependencies = [
[[package]]
name = "cosmic-theme"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"almost",
"configparser",
@ -2159,7 +2159,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users",
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -2349,7 +2349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
"windows-sys 0.52.0",
"windows-sys 0.61.2",
]
[[package]]
@ -3247,7 +3247,7 @@ dependencies = [
[[package]]
name = "iced"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"build_helpers",
"dnd",
@ -3269,7 +3269,7 @@ dependencies = [
[[package]]
name = "iced_accessibility"
version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"accesskit",
"accesskit_winit",
@ -3278,7 +3278,7 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"bitflags 2.13.1",
"build_helpers",
@ -3305,7 +3305,7 @@ dependencies = [
[[package]]
name = "iced_debug"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"iced_core",
"iced_futures",
@ -3315,7 +3315,7 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"futures",
"iced_core",
@ -3329,7 +3329,7 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"bitflags 2.13.1",
"bytemuck",
@ -3350,7 +3350,7 @@ dependencies = [
[[package]]
name = "iced_program"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"iced_graphics",
"iced_runtime",
@ -3359,7 +3359,7 @@ dependencies = [
[[package]]
name = "iced_renderer"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@ -3371,7 +3371,7 @@ dependencies = [
[[package]]
name = "iced_runtime"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"build_helpers",
"bytes",
@ -3388,7 +3388,7 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"bytemuck",
"cosmic-text",
@ -3405,7 +3405,7 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"as-raw-xcb-connection",
"bitflags 2.13.1",
@ -3437,7 +3437,7 @@ dependencies = [
[[package]]
name = "iced_widget"
version = "0.14.2"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"build_helpers",
"cosmic-client-toolkit",
@ -3458,7 +3458,7 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.14.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"build_helpers",
"cosmic-client-toolkit",
@ -4516,7 +4516,7 @@ version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a1886916523694cd6ea3d175f03a1e5010699a2a4cc13696d83d7bea1d80638"
dependencies = [
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -4581,7 +4581,7 @@ checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
[[package]]
name = "libcosmic"
version = "1.0.0"
source = "git+https://github.com/pop-os/libcosmic#2a73fbc0edfe1525381bf999e241d73def79b222"
source = "git+https://github.com/pop-os/libcosmic#a401af8b1c54a8abd393b8c5b7c8809402f83850"
dependencies = [
"apply",
"ashpd 0.12.3",
@ -4621,6 +4621,7 @@ dependencies = [
"phf",
"rfd",
"ron 0.12.2",
"roxmltree",
"rust-embed",
"rustix 1.1.4",
"serde",
@ -5163,7 +5164,7 @@ version = "0.50.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
dependencies = [
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -6488,7 +6489,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys 0.12.1",
"windows-sys 0.52.0",
"windows-sys 0.61.2",
]
[[package]]
@ -6959,7 +6960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
dependencies = [
"libc",
"windows-sys 0.60.2",
"windows-sys 0.61.2",
]
[[package]]
@ -7209,10 +7210,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
dependencies = [
"fastrand",
"getrandom 0.3.4",
"getrandom 0.4.3",
"once_cell",
"rustix 1.1.4",
"windows-sys 0.52.0",
"windows-sys 0.61.2",
]
[[package]]
@ -7637,7 +7638,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
dependencies = [
"memoffset",
"tempfile",
"windows-sys 0.60.2",
"windows-sys 0.61.2",
]
[[package]]
@ -8301,7 +8302,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
"windows-sys 0.48.0",
"windows-sys 0.61.2",
]
[[package]]

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

@ -174,7 +174,7 @@ pub enum Message {
SearchSubmit,
SetTheme(cosmic::theme::Theme),
SetWindowTitle,
Surface(surface::Action),
Surface(surface::Action<Message>),
}
impl cosmic::Application for SettingsApp {
@ -860,9 +860,7 @@ impl cosmic::Application for SettingsApp {
tracing::error!(error, "error occurred");
}
Message::Surface(a) => {
return cosmic::task::message(cosmic::Action::Cosmic(
cosmic::app::Action::Surface(a),
));
return cosmic::task::message(cosmic::Action::Surface(a));
}
}

2
cosmic-settings/src/pages/accessibility/magnifier.rs
View file

@ -42,7 +42,7 @@ pub enum Message {
SetIncrement(usize),
SetSignin(bool),
SetMovement(ZoomMovement),
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
impl Default for Page {

2
cosmic-settings/src/pages/accessibility/mod.rs
View file

@ -95,7 +95,7 @@ pub enum Message {
SetScreenFilterSelection(ColorFilter),
SetScreenInverted(bool),
SetSoundMono(bool),
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
SystemTheme(Box<cosmic::cosmic_theme::Theme>),
}

2
cosmic-settings/src/pages/applications/default_apps.rs
View file

@ -48,7 +48,7 @@ pub enum Category {
pub enum Message {
SetDefault(Category, usize),
Update(Arc<CachedMimeApps>),
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
impl From<Message> for crate::app::Message {

2
cosmic-settings/src/pages/applications/legacy_applications.rs
View file

@ -25,7 +25,7 @@ pub enum Message {
SetXwaylandKeyboardMode(EavesdroppingKeyboardMode),
SetXwaylandMouseButtonMode(bool),
SetXwaylandPrimaryOutput(usize),
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
impl From<Message> for crate::pages::Message {

2
cosmic-settings/src/pages/desktop/panel/inner.rs
View file

@ -431,7 +431,7 @@ pub enum Message {
PanelConfig(Box<CosmicPanelConfig>),
ResetPanel,
FullReset,
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
impl PageInner {

2
cosmic-settings/src/pages/desktop/wallpaper/mod.rs
View file

@ -102,7 +102,7 @@ pub enum Message {
Slideshow(bool),
/// State change from cosmic-bg
UpdateState(cosmic_bg_config::state::State),
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
impl From<Message> for crate::app::Message {

2
cosmic-settings/src/pages/desktop/window_management.rs
View file

@ -24,7 +24,7 @@ pub enum Message {
ShowMaximizeButton(bool),
ShowMinimizeButton(bool),
SetEdgeSnapThreshold(u32),
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
pub struct Page {

2
cosmic-settings/src/pages/desktop/workspaces.rs
View file

@ -19,7 +19,7 @@ pub enum Message {
SetWorkspaceWraparound(bool),
SetShowName(bool),
SetShowNumber(bool),
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
pub struct Page {

2
cosmic-settings/src/pages/display/mod.rs
View file

@ -108,7 +108,7 @@ pub enum Message {
/// Available outputs from cosmic-randr.
randr: Arc<Result<List, cosmic_randr_shell::Error>>,
},
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
impl From<Message> for app::Message {

2
cosmic-settings/src/pages/power/mod.rs
View file

@ -312,7 +312,7 @@ pub enum Message {
SuspendOnBatteryTimeChange(Option<Duration>),
BackendAvailabilityCheck(Option<backend::PowerBackendEnum>),
CurrentPowerProfileUpdate(PowerProfile),
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
impl From<Message> for crate::app::Message {

2
cosmic-settings/src/pages/sound/applications.rs
View file

@ -28,7 +28,7 @@ pub enum Message {
SetMute(u32, bool),
SetSink(u32, usize),
SetVolume(u32, u32),
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
ToggleExpanded(u32),
}

2
cosmic-settings/src/pages/sound/device_profiles.rs
View file

@ -19,7 +19,7 @@ pub enum Message {
/// Set the profile of a sound device.
SetProfile(u32, u32),
/// Surface Action
Surface(cosmic::surface::Action),
Surface(cosmic::surface::Action<crate::app::Message>),
}
impl From<Message> for crate::pages::Message {

2
cosmic-settings/src/pages/sound/mod.rs
View file

@ -39,7 +39,7 @@ pub enum Message {
/// Request to change the input volume.
SetSourceVolume(u32),
/// Surface Action
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
/// Toggle the mute status of the output.
ToggleSinkMute,
/// Toggle the mute status of the input output.

2
cosmic-settings/src/pages/time/date.rs
View file

@ -365,7 +365,7 @@ pub enum Message {
TimezoneContext,
TimezoneSearch(String),
UpdateTime,
Surface(surface::Action),
Surface(surface::Action<crate::app::Message>),
}
impl page::AutoBind<crate::pages::Message> for Page {}