From a7d8d73c9f1a72af11f18e7c13602976fbd8562b Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Fri, 3 May 2024 10:29:15 -0400
Subject: [PATCH] fix: apply the roundness to the panel after reset to system
 defaults

---
 cosmic-settings/src/pages/desktop/appearance.rs  |  2 ++
 cosmic-settings/src/pages/desktop/panel/inner.rs | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/cosmic-settings/src/pages/desktop/appearance.rs b/cosmic-settings/src/pages/desktop/appearance.rs
index c4b4dc0..6bd43af 100644
--- a/cosmic-settings/src/pages/desktop/appearance.rs
+++ b/cosmic-settings/src/pages/desktop/appearance.rs
@@ -698,6 +698,8 @@ impl Page {
                     tracing::error!("Failed to get the theme config.");
                 }
 
+                Self::update_panel_radii(self.roundness);
+
                 self.reload_theme_mode();
                 Command::none()
             }
diff --git a/cosmic-settings/src/pages/desktop/panel/inner.rs b/cosmic-settings/src/pages/desktop/panel/inner.rs
index 5f63965..3c6add3 100644
--- a/cosmic-settings/src/pages/desktop/panel/inner.rs
+++ b/cosmic-settings/src/pages/desktop/panel/inner.rs
@@ -1,7 +1,6 @@
 use cosmic::{
     cctk::sctk::reexports::client::{backend::ObjectId, protocol::wl_output::WlOutput, Proxy},
-    cosmic_config::{self, Config, CosmicConfigEntry},
-    cosmic_theme::{CornerRadii, ThemeBuilder, ThemeMode},
+    cosmic_config::{self, CosmicConfigEntry},
     iced::Length,
     theme,
     widget::{
@@ -398,13 +397,22 @@ impl PageInner {
             Message::ResetPanel => {
                 if let Some((default, config)) = self
                     .system_default
-                    .as_ref()
+                    .as_mut()
                     .zip(self.config_helper.as_ref())
                 {
-                    self.panel_config = self.system_default.clone();
+                    if default.anchor_gap || !default.expand_to_edges {
+                        let radii = cosmic::theme::system_preference()
+                            .cosmic()
+                            .corner_radii
+                            .radius_xl[0] as u32;
+                        default.border_radius = radii;
+                    } else {
+                        default.border_radius = 0;
+                    }
                     if let Err(err) = default.write_entry(config) {
                         tracing::error!(?err, "Error resetting panel config.");
                     }
+                    self.panel_config = self.system_default.clone();
                 } else {
                     tracing::error!("Panel config default is missing.");
                 }