From 8b2bf931ae8f75a203de637963c9bb22412e9e54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <wscientia+github@gmail.com>
Date: Sun, 8 Jun 2025 16:21:43 +0200
Subject: [PATCH] fix(applets_inner): use `radius_s` for dnd items

Also fixes compile errors on the Bluetooth page.
---
 cosmic-settings/src/pages/bluetooth/mod.rs             | 10 +++++-----
 .../src/pages/desktop/panel/applets_inner.rs           |  4 ++--
 .../src/pages/input/keyboard/shortcuts/mod.rs          |  1 -
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cosmic-settings/src/pages/bluetooth/mod.rs b/cosmic-settings/src/pages/bluetooth/mod.rs
index 2abc46a..c3c1351 100644
--- a/cosmic-settings/src/pages/bluetooth/mod.rs
+++ b/cosmic-settings/src/pages/bluetooth/mod.rs
@@ -199,7 +199,7 @@ impl page::Page<crate::pages::Message> for Page {
         }
 
         if let Some(connection) = self.connection.take() {
-            let adapters = self.adapters.clone();
+            let adapters = self.model.adapters.clone();
 
             // Block the current thread to ensure that discovery is stopped
             // on all adapters when the app is closed.
@@ -382,12 +382,12 @@ impl Page {
                 }
 
                 Event::UpdatedAdapter(path, update) => {
-                    if let Some(existing) = self.adapters.get_mut(&path) {
+                    if let Some(existing) = self.model.adapters.get_mut(&path) {
                         tracing::debug!("Adapter {} updated: {update:#?}", existing.address);
-                        existing.update(update);
+                        existing.update(update.clone());
                     }
 
-                    self.update_status();
+                    self.model.update_status();
                     if let Some(connection) = self.connection.clone() {
                         if let Some(discovery_future) =
                             self.model.updated_adapter(path, update, connection)
@@ -987,7 +987,7 @@ fn multiple_adapter() -> Section<crate::pages::Message> {
                         widget::horizontal_space().into(),
                         widget::icon::from_name("go-next-symbolic").into(),
                     ];
-                    if page.adapter_connected(path) {
+                    if page.model.adapter_connected(path) {
                         items.insert(
                             4,
                             text(&descriptions[device_connected])
diff --git a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs
index 4c27d50..f380a2d 100644
--- a/cosmic-settings/src/pages/desktop/panel/applets_inner.rs
+++ b/cosmic-settings/src/pages/desktop/panel/applets_inner.rs
@@ -670,7 +670,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
                 .padding(8)
                 .class(theme::Container::Custom(Box::new(move |theme| {
                     let mut style = container::Catalog::style(theme, &theme::Container::Primary);
-                    style.border.radius = 8.0.into();
+                    style.border.radius = theme.cosmic().radius_s().into();
                     if is_dragged {
                         style.border.color = theme.cosmic().accent_color().into();
                         style.border.width = 2.0;
@@ -702,7 +702,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
                 .padding(8)
                 .class(theme::Container::Custom(Box::new(move |theme| {
                     let mut style = container::Catalog::style(theme, &theme::Container::Primary);
-                    style.border.radius = 8.0.into();
+                    style.border.radius = theme.cosmic().radius_s().into();
                     style.border.color = theme.cosmic().bg_divider().into();
                     style.border.width = 2.0;
                     style.background = Some(Color::TRANSPARENT.into());
diff --git a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs
index 2825c9e..b9ef948 100644
--- a/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs
+++ b/cosmic-settings/src/pages/input/keyboard/shortcuts/mod.rs
@@ -25,7 +25,6 @@ use cosmic_settings_config::shortcuts::{self, Action, Shortcuts};
 use cosmic_settings_page::Section;
 use cosmic_settings_page::{self as page, section};
 use itertools::Itertools;
-use sctk::seat::keyboard::Keysym;
 use shortcuts::action::System as SystemAction;
 use slab::Slab;
 use slotmap::{DefaultKey, Key, SecondaryMap, SlotMap};