move hex parsing

a-b-street · Jun 8, 2019 · 53d87af · 53d87af
1 parent d0de5d8
commit 53d87af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/editor/src/helpers.rs b/editor/src/helpers.rs
@@ -309,13 +309,7 @@ pub fn rotating_color_total(idx: usize, total: usize) -> Color {
         colorbrewer::get_color_ramp(colorbrewer::Palette::YlOrBr, total as u32)
             .unwrap()
             .into_iter()
-            .map(|raw| {
-                // Skip the leading '#'
-                let r = usize::from_str_radix(&raw[1..3], 16).unwrap();
-                let g = usize::from_str_radix(&raw[3..5], 16).unwrap();
-                let b = usize::from_str_radix(&raw[5..7], 16).unwrap();
-                Color::rgb(r, g, b)
-            })
+            .map(Color::from_hex)
             .collect();
 
     colors[idx % total]

diff --git a/ezgui/src/color.rs b/ezgui/src/color.rs
@@ -77,4 +77,12 @@ impl Color {
         }
         panic!("Can't transform {} to a string", self);
     }
+
+    pub fn from_hex(raw: &str) -> Color {
+        // Skip the leading '#'
+        let r = usize::from_str_radix(&raw[1..3], 16).unwrap();
+        let g = usize::from_str_radix(&raw[3..5], 16).unwrap();
+        let b = usize::from_str_radix(&raw[5..7], 16).unwrap();
+        Color::rgb(r, g, b)
+    }
 }