From 3507e9f4cffa09c79b16d5e33f637ee392d9c606 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Fri, 4 Aug 2023 16:06:35 -0400
Subject: [PATCH] refactor: make corner radius f32 so that it's easier to use
 with BorderRadius

---
 cosmic-theme/src/model/corner.rs | 26 +++++++++++++-------------
 cosmic-theme/src/model/theme.rs  | 14 +++++++-------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/cosmic-theme/src/model/corner.rs b/cosmic-theme/src/model/corner.rs
index e466959d..ecd18c0b 100644
--- a/cosmic-theme/src/model/corner.rs
+++ b/cosmic-theme/src/model/corner.rs
@@ -1,31 +1,31 @@
 use serde::{Deserialize, Serialize};
 
 /// Corner radii variables for the Cosmic theme
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Deserialize, Serialize)]
+#[derive(Debug, Copy, Clone, PartialEq, Deserialize, Serialize)]
 pub struct CornerRadii {
     /// corner radii of 0
-    pub radius_0: [u16; 4],
+    pub radius_0: [f32; 4],
     /// smallest size of corner radii that can be non-zero
-    pub radius_xs: [u16; 4],
+    pub radius_xs: [f32; 4],
     /// small corner radii
-    pub radius_s: [u16; 4],
+    pub radius_s: [f32; 4],
     /// medium corner radii
-    pub radius_m: [u16; 4],
+    pub radius_m: [f32; 4],
     /// large corner radii
-    pub radius_l: [u16; 4],
+    pub radius_l: [f32; 4],
     /// extra large corner radii
-    pub radius_xl: [u16; 4],
+    pub radius_xl: [f32; 4],
 }
 
 impl Default for CornerRadii {
     fn default() -> Self {
         Self {
-            radius_0: [0; 4],
-            radius_xs: [4; 4],
-            radius_s: [8; 4],
-            radius_m: [16; 4],
-            radius_l: [32; 4],
-            radius_xl: [160; 4],
+            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],
         }
     }
 }
diff --git a/cosmic-theme/src/model/theme.rs b/cosmic-theme/src/model/theme.rs
index ec7bb64f..07addca1 100644
--- a/cosmic-theme/src/model/theme.rs
+++ b/cosmic-theme/src/model/theme.rs
@@ -20,7 +20,7 @@ pub enum Layer {
 }
 
 /// Cosmic Theme data structure with all colors and its name
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub struct Theme<C> {
     /// name of the theme
     pub name: String,
@@ -346,27 +346,27 @@ where
     }
 
     /// get @radius_0
-    pub fn radius_0(&self) -> [u16; 4] {
+    pub fn radius_0(&self) -> [f32; 4] {
         self.corner_radii.radius_0
     }
     /// get @radius_xs
-    pub fn radius_xs(&self) -> [u16; 4] {
+    pub fn radius_xs(&self) -> [f32; 4] {
         self.corner_radii.radius_xs
     }
     /// get @radius_s
-    pub fn radius_s(&self) -> [u16; 4] {
+    pub fn radius_s(&self) -> [f32; 4] {
         self.corner_radii.radius_s
     }
     /// get @radius_m
-    pub fn radius_m(&self) -> [u16; 4] {
+    pub fn radius_m(&self) -> [f32; 4] {
         self.corner_radii.radius_m
     }
     /// get @radius_l
-    pub fn radius_l(&self) -> [u16; 4] {
+    pub fn radius_l(&self) -> [f32; 4] {
         self.corner_radii.radius_l
     }
     /// get @radius_xl
-    pub fn radius_xl(&self) -> [u16; 4] {
+    pub fn radius_xl(&self) -> [f32; 4] {
         self.corner_radii.radius_xl
     }
 }