From af7157b45a9efe58b7185a5fe7957cb51b94dbc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= <wscientia+github@gmail.com>
Date: Mon, 25 Nov 2024 02:36:11 +0100
Subject: [PATCH] improv: window border corner appearance

---
 src/app/mod.rs          | 10 +++++++---
 src/theme/style/iced.rs | 26 ++++----------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/app/mod.rs b/src/app/mod.rs
index eb53a67e..b137ecb7 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -892,13 +892,17 @@ impl<App: Application> ApplicationExt for App {
             .apply(container)
             .padding(if sharp_corners { 0 } else { 1 })
             .style(move |theme| container::Style {
+                icon_color: Some(iced::Color::from(theme.cosmic().background.on)),
+                text_color: Some(iced::Color::from(theme.cosmic().background.on)),
+                background: Some(iced::Background::Color(
+                    theme.cosmic().background.base.into(),
+                )),
                 border: iced::Border {
                     color: theme.cosmic().bg_divider().into(),
                     width: if sharp_corners { 0.0 } else { 1.0 },
-                    // x + 2.0 is used to prevent corner artifacts
-                    radius: theme.cosmic().radius_s().map(|x| x + 2.0).into(),
+                    radius: theme.cosmic().radius_s().into(),
                 },
-                ..Default::default()
+                shadow: iced::Shadow::default(),
             });
 
         // Show any current dialog on top and centered over the view content
diff --git a/src/theme/style/iced.rs b/src/theme/style/iced.rs
index f51e2650..1bf20524 100644
--- a/src/theme/style/iced.rs
+++ b/src/theme/style/iced.rs
@@ -469,17 +469,8 @@ impl iced_container::Catalog for Theme {
             Container::WindowBackground => iced_container::Style {
                 icon_color: Some(Color::from(cosmic.background.on)),
                 text_color: Some(Color::from(cosmic.background.on)),
-                background: Some(iced::Background::Color(cosmic.background.base.into())),
-                border: Border {
-                    radius: [
-                        cosmic.corner_radii.radius_0[0],
-                        cosmic.corner_radii.radius_0[1],
-                        cosmic.corner_radii.radius_s[2],
-                        cosmic.corner_radii.radius_s[3],
-                    ]
-                    .into(),
-                    ..Default::default()
-                },
+                background: None,
+                border: Border::default(),
                 shadow: Shadow::default(),
             },
 
@@ -513,17 +504,8 @@ impl iced_container::Catalog for Theme {
                 iced_container::Style {
                     icon_color: Some(icon_color),
                     text_color: Some(text_color),
-                    background: Some(iced::Background::Color(cosmic.background.base.into())),
-                    border: Border {
-                        radius: [
-                            cosmic.corner_radii.radius_s[0],
-                            cosmic.corner_radii.radius_s[1],
-                            cosmic.corner_radii.radius_0[2],
-                            cosmic.corner_radii.radius_0[3],
-                        ]
-                        .into(),
-                        ..Default::default()
-                    },
+                    background: None,
+                    border: Border::default(),
                     shadow: Shadow::default(),
                 }
             }