refactor: add float parameter for format_hsla and format_rgba (#95)

InioX · Aug 13, 2024 · 26b2f92 · 26b2f92
1 parent f22dd21
commit 26b2f92
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 22 deletions.
diff --git a/src/util/color.rs b/src/util/color.rs
@@ -54,14 +54,24 @@ pub fn format_rgb(color: &Rgb) -> String {
     )
 }
 
-pub fn format_rgba(color: &Rgb) -> String {
-    format!(
-        "rgba({:?}, {:?}, {:?}, {:?})",
-        color.red() as u8,
-        color.green() as u8,
-        color.blue() as u8,
-        color.alpha() as u8
-    )
+pub fn format_rgba(color: &Rgb, float: bool) -> String {
+    if float {
+        format!(
+            "rgba({:?}, {:?}, {:?}, {:?})",
+            color.red() as u8,
+            color.green() as u8,
+            color.blue() as u8,
+            color.alpha()
+        )
+    } else {
+        format!(
+            "rgba({:?}, {:?}, {:?}, {:?})",
+            color.red() as u8,
+            color.green() as u8,
+            color.blue() as u8,
+            color.alpha() as u8
+        )
+    }
 }
 
 pub fn format_rgba_float(color: &Rgb) -> String {
@@ -83,14 +93,24 @@ pub fn format_hsl(color: &Hsl) -> String {
     )
 }
 
-pub fn format_hsla(color: &Hsl) -> String {
-    format!(
-        "hsla({:?}, {:?}%, {:?}%, {:?})",
-        color.hue() as u8,
-        color.saturation() as u8,
-        color.lightness() as u8,
-        color.alpha() as u8
-    )
+pub fn format_hsla(color: &Hsl, float: bool) -> String {
+    if float {
+        format!(
+            "hsla({:?}, {:?}%, {:?}%, {:?})",
+            color.hue() as u8,
+            color.saturation() as u8,
+            color.lightness() as u8,
+            color.alpha()
+        )
+    } else {
+        format!(
+            "hsla({:?}, {:?}%, {:?}%, {:?})",
+            color.hue() as u8,
+            color.saturation() as u8,
+            color.lightness() as u8,
+            color.alpha() as u8
+        )
+    }
 }
 
 pub fn format_hsla_float(color: &Hsl) -> String {

diff --git a/src/util/filters.rs b/src/util/filters.rs
@@ -50,7 +50,7 @@ pub fn set_lightness(value: &Value, amount: f64) -> Result<String, String> {
 
             color.lighten(amount);
 
-            Ok(format_rgba(&color))
+            Ok(format_rgba(&color, true))
         }
         "hsl" => {
             let mut color = Hsl::from_str(string).unwrap();
@@ -64,7 +64,7 @@ pub fn set_lightness(value: &Value, amount: f64) -> Result<String, String> {
 
             color.lighten(amount);
 
-            Ok(format_hsla(&color))
+            Ok(format_hsla(&color, true))
         }
         v => Ok(v.to_string()),
     }
@@ -92,13 +92,13 @@ pub fn set_alpha(value: &Value, amount: f64) -> Result<String, String> {
         "rgba" => {
             let mut color = Rgb::from_str(string).unwrap();
             color.set_alpha(amount);
-            Ok(format_rgba_float(&color))
+            Ok(format_rgba(&color, true))
         }
         "hsl" => Err("cannot set alpha on hsl color, use hsla".to_string()),
         "hsla" => {
             let mut color = Hsl::from_str(string).unwrap();
             color.set_alpha(amount);
-            Ok(format_hsla_float(&color))
+            Ok(format_hsla(&color, true))
         }
         v => Ok(v.to_string()),
     }

diff --git a/src/util/template.rs b/src/util/template.rs
@@ -403,9 +403,9 @@ fn generate_color_strings(color: Argb) -> Colora {
         hex: format_hex(&base_color),
         hex_stripped: format_hex_stripped(&base_color),
         rgb: format_rgb(&base_color),
-        rgba: format_rgba(&base_color),
+        rgba: format_rgba(&base_color, true),
         hsl: format_hsl(&hsl_color),
-        hsla: format_hsla(&hsl_color),
+        hsla: format_hsla(&hsl_color, true),
         red: format!("{:?}", base_color.red() as u8),
         green: format!("{:?}", base_color.green() as u8),
         blue: format!("{:?}", base_color.blue() as u8),