refactor: move rounding into border table and optimize border drawing with encapsulation

README.md

@@ -42,8 +42,6 @@ height = 150
 
 [display]
 image_size = 64
-
-rounding = 10
 padding = 8
 
 timeout = 2000
@@ -58,12 +56,13 @@ foreground = "#1E1E2E"
 
 [display.border]
 size = 4
+radius = 10
 color = "#000"
 
 [[app]]
 name = "Telegram Desktop"
 [app.display]
-rounding = 8
+border = { radius = 8 }
 markup = true
 
 [app.display.body]

src/config.rs

@@ -225,7 +225,6 @@ impl From<String> for Anchor {
 pub struct DisplayConfig {
     image_size: Option<u16>,
 
-    rounding: Option<u8>,
     padding: Option<u8>,
 
     border: Option<Border>,
@@ -243,10 +242,6 @@ impl DisplayConfig {
         self.image_size.unwrap()
     }
 
-    pub fn rounding(&self) -> u8 {
-        self.rounding.unwrap()
-    }
-
     pub fn padding(&self) -> u8 {
         self.padding.unwrap()
     }
@@ -280,10 +275,6 @@ impl DisplayConfig {
             self.image_size = Some(64);
         }
 
-        if self.rounding.is_none() {
-            self.rounding = Some(0);
-        }
-
         if self.padding.is_none() {
             self.padding = Some(0);
         }
@@ -435,6 +426,7 @@ impl From<String> for Color {
 #[derive(Debug, Deserialize, Default, Clone)]
 pub struct Border {
     size: Option<u8>,
+    radius: Option<u8>,
     color: Option<Color>,
 }
 
@@ -443,6 +435,10 @@ impl Border {
         self.size.unwrap()
     }
 
+    pub fn radius(&self) -> u8 {
+        self.radius.unwrap()
+    }
+
     pub fn color(&self) -> &Color {
         self.color.as_ref().unwrap()
     }
@@ -452,6 +448,10 @@ impl Border {
             self.size = Some(0);
         }
 
+        if self.radius.is_none() {
+            self.radius = Some(0);
+        }
+
         if self.color.is_none() {
             self.color = Some(Default::default());
         }
@@ -528,12 +528,13 @@ impl AppConfig {
         if let Some(display) = self.display.as_mut() {
             display.image_size = display.image_size.or(other.image_size);
 
-            display.rounding = display.rounding.or(other.rounding);
             display.padding = display.padding.or(other.padding);
 
             if let Some(border) = display.border.as_mut() {
                 let other_border = other.border(); // The other type shall have border
+
                 border.size = border.size.or(other_border.size);
+                border.radius = border.radius.or(other_border.radius);
                 border.color = border.color.clone().or(other_border.color.clone());
             } else {
                 display.border = other.border.clone();