chore: update libcosmic

Cargo.lock

@@ -1205,7 +1205,7 @@ checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
 dependencies = [
  "serde",
  "termcolor",
- "unicode-width 0.1.14",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -1397,7 +1397,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "atomicwrites",
  "cosmic-config-derive",
@@ -1418,7 +1418,7 @@ dependencies = [
 [[package]]
 name = "cosmic-config-derive"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "quote",
  "syn 2.0.117",
@@ -1834,7 +1834,7 @@ dependencies = [
 [[package]]
 name = "cosmic-theme"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "almost",
  "configparser",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "iced"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "dnd",
  "iced_accessibility",
@@ -3263,7 +3263,7 @@ dependencies = [
 [[package]]
 name = "iced_accessibility"
 version = "0.1.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "accesskit",
  "accesskit_winit",
@@ -3272,7 +3272,7 @@ dependencies = [
 [[package]]
 name = "iced_core"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "bitflags 2.11.1",
  "bytes",
@@ -3297,7 +3297,7 @@ dependencies = [
 [[package]]
 name = "iced_debug"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "iced_core",
  "iced_futures",
@@ -3307,7 +3307,7 @@ dependencies = [
 [[package]]
 name = "iced_futures"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "futures",
  "iced_core",
@@ -3321,7 +3321,7 @@ dependencies = [
 [[package]]
 name = "iced_graphics"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "bitflags 2.11.1",
  "bytemuck",
@@ -3342,7 +3342,7 @@ dependencies = [
 [[package]]
 name = "iced_program"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "iced_graphics",
  "iced_runtime",
@@ -3351,7 +3351,7 @@ dependencies = [
 [[package]]
 name = "iced_renderer"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "iced_graphics",
  "iced_tiny_skia",
@@ -3363,7 +3363,7 @@ dependencies = [
 [[package]]
 name = "iced_runtime"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "bytes",
  "cosmic-client-toolkit",
@@ -3379,7 +3379,7 @@ dependencies = [
 [[package]]
 name = "iced_tiny_skia"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "bytemuck",
  "cosmic-text",
@@ -3396,7 +3396,7 @@ dependencies = [
 [[package]]
 name = "iced_wgpu"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "as-raw-xcb-connection",
  "bitflags 2.11.1",
@@ -3427,7 +3427,7 @@ dependencies = [
 [[package]]
 name = "iced_widget"
 version = "0.14.2"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "cosmic-client-toolkit",
  "dnd",
@@ -3447,7 +3447,7 @@ dependencies = [
 [[package]]
 name = "iced_winit"
 version = "0.14.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "cosmic-client-toolkit",
  "cursor-icon",
@@ -4552,14 +4552,14 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"
 
 [[package]]
 name = "libc"
-version = "0.2.185"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
 
 [[package]]
 name = "libcosmic"
 version = "1.0.0"
-source = "git+https://github.com/pop-os/libcosmic#8768bce2e2a4921ced57d95cff74bc7c92ef08b8"
+source = "git+https://github.com/pop-os/libcosmic#9c2a86a8f4d6faff2fe28627820c29c5430d95d5"
 dependencies = [
  "apply",
  "ashpd 0.12.3",
@@ -9029,15 +9029,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winnow"
-version = "0.7.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "1.0.1"
@@ -9351,9 +9342,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "5.14.0"
+version = "5.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc"
+checksum = "c3bcbf15c8708d7fc1be0c993622e0a5cbd5e8b52bfa40afa4c3e0cd8d724ac1"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -9379,7 +9370,7 @@ dependencies = [
  "uds_windows",
  "uuid",
  "windows-sys 0.61.2",
- "winnow 0.7.15",
+ "winnow 1.0.1",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -9411,9 +9402,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.14.0"
+version = "5.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222"
+checksum = "51fa5406ad9175a8c825a931f8cf347116b531b3634fcb0b627c290f1f2516ff"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9426,12 +9417,12 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.3.1"
+version = "4.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
+checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d"
 dependencies = [
  "serde",
- "winnow 0.7.15",
+ "winnow 1.0.1",
  "zvariant",
 ]
 
@@ -9595,24 +9586,24 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.10.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b"
+checksum = "1c1567a6ec68df868cbbfde844cfc6d81649fe5109a62b116b19fabd53e618ee"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
  "url",
- "winnow 0.7.15",
+ "winnow 1.0.1",
  "zvariant_derive",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_derive"
-version = "5.10.0"
+version = "5.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c"
+checksum = "c7d5b780599bbde114e39d9a0799577fad1ced5105d38515745f7b3099d8ceda"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9623,13 +9614,13 @@ dependencies = [
 
 [[package]]
 name = "zvariant_utils"
-version = "3.3.0"
+version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
+checksum = "6d464f5733ffa07a3164d656f18533caace9d0638596721355d73256a410d691"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
  "syn 2.0.117",
- "winnow 0.7.15",
+ "winnow 1.0.1",
 ]

cosmic-settings/src/pages/desktop/appearance/mod.rs

@@ -16,7 +16,7 @@ use cosmic::app::ContextDrawer;
 use cosmic::config::CosmicTk;
 use cosmic::cosmic_config::{Config, ConfigSet, CosmicConfigEntry};
 use cosmic::cosmic_theme::palette::{FromColor, Hsv, Srgb};
-use cosmic::cosmic_theme::{CornerRadii, Density, ThemeBuilder, ThemeMode};
+use cosmic::cosmic_theme::{CornerRadii, Density, Roundness, ThemeBuilder, ThemeMode};
 #[cfg(feature = "xdg-portal")]
 use cosmic::dialog::file_chooser::{self, FileFilter};
 use cosmic::iced::Subscription;
@@ -171,56 +171,6 @@ impl From<Message> for crate::pages::Message {
     }
 }
 
-#[derive(Debug, Clone, Copy)]
-pub enum Roundness {
-    Round,
-    SlightlyRound,
-    Square,
-}
-
-impl From<Roundness> for CornerRadii {
-    fn from(value: Roundness) -> Self {
-        match value {
-            Roundness::Round => CornerRadii {
-                radius_0: [0.0; 4],
-                radius_xs: [4.0; 4],
-                radius_s: [8.0; 4],
-                radius_m: [16.0; 4],
-                radius_l: [32.0; 4],
-                radius_xl: [160.0; 4],
-            },
-            Roundness::SlightlyRound => CornerRadii {
-                radius_0: [0.0; 4],
-                radius_xs: [2.0; 4],
-                radius_s: [8.0; 4],
-                radius_m: [8.0; 4],
-                radius_l: [8.0; 4],
-                radius_xl: [8.0; 4],
-            },
-            Roundness::Square => CornerRadii {
-                radius_0: [0.0; 4],
-                radius_xs: [2.0; 4],
-                radius_s: [2.0; 4],
-                radius_m: [2.0; 4],
-                radius_l: [2.0; 4],
-                radius_xl: [2.0; 4],
-            },
-        }
-    }
-}
-
-impl From<CornerRadii> for Roundness {
-    fn from(value: CornerRadii) -> Self {
-        if (value.radius_m[0] - 16.0).abs() < 0.01 {
-            Self::Round
-        } else if (value.radius_m[0] - 8.0).abs() < 0.01 {
-            Self::SlightlyRound
-        } else {
-            Self::Square
-        }
-    }
-}
-
 impl Page {
     #[allow(clippy::too_many_lines)]
     pub fn update(&mut self, message: Message) -> Task<app::Message> {

cosmic-settings/src/pages/desktop/panel/inner.rs

@@ -2,7 +2,7 @@ use cosmic::{
     Element, Task,
     cctk::sctk::reexports::client::{Proxy, backend::ObjectId, protocol::wl_output::WlOutput},
     cosmic_config::{self, CosmicConfigEntry},
-    cosmic_theme::Density,
+    cosmic_theme::{Density, Roundness},
     iced::{Alignment, Length},
     surface,
     widget::{button, container, dropdown, row, settings, slider, space, text},
@@ -17,8 +17,6 @@ use cosmic_panel_config::{
 use cosmic_settings_page::{self as page, Section};
 use std::{collections::HashMap, time::Duration};
 
-use crate::pages::desktop::appearance::Roundness;
-
 pub struct PageInner {
     pub(crate) config_helper: Option<cosmic_config::Config>,
     pub(crate) panel_config: Option<CosmicPanelConfig>,