improv: Parse color string when layout is parsed

Author: ids1024

src/application/key.rs

@@ -1,5 +1,6 @@
 use std::cell::RefCell;
 
+use crate::color::Rgb;
 use super::page::Page;
 use super::picker::SCANCODE_LABELS;
 use super::rect::Rect;
@@ -21,9 +22,9 @@ pub struct Key {
     // Currently loaded scancodes and their names
     pub(crate) scancodes: RefCell<Vec<(u16, String)>>,
     // Background color
-    pub(crate) background_color: String,
+    pub(crate) background_color: Rgb,
     // Foreground color
-    pub(crate) foreground_color: String,
+    pub(crate) foreground_color: Rgb,
 }
 
 impl Key {

src/application/keyboard.rs

@@ -21,6 +21,7 @@ use std::{
     str,
 };
 
+use crate::color::Rgb;
 use crate::daemon::Daemon;
 use crate::keyboard::Keyboard as ColorKeyboard;
 use crate::keyboard_color_button::KeyboardColorButton;
@@ -478,15 +479,15 @@ impl Keyboard {
             };
 
             drawing_area.connect_draw(clone!(@weak kb => @default-panic, move |drawing_area, cr| {
+                let selected = Rgb::new(0xfb, 0xb8, 0x6c).to_floats();
                 for (i, k) in kb.keys().iter().enumerate() {
                     let x = (k.physical.x * SCALE) + MARGIN;
                     let y = -(k.physical.y * SCALE) + MARGIN;
                     let w = (k.physical.w * SCALE) - MARGIN * 2.;
                     let h = (k.physical.h * SCALE) - MARGIN * 2.;
 
-                    let bg = crate::color::Rgb::parse(&k.background_color[1..]).unwrap().to_floats();
-                    let fg = crate::color::Rgb::parse(&k.foreground_color[1..]).unwrap().to_floats();
-                    let selected = crate::color::Rgb::parse("fbb86c").unwrap().to_floats();
+                    let bg = k.background_color.to_floats();
+                    let fg = k.foreground_color.to_floats();
 
                     cr.rectangle(x, y, w, h);
                     cr.set_source_rgb(bg.0, bg.1, bg.2);

src/application/layout/mod.rs

@@ -5,6 +5,7 @@ use std::collections::HashMap;
 mod physical_layout;
 pub(super) use physical_layout::PhysicalLayout;
 
+use crate::color::Rgb;
 use crate::keymap::KeyMap;
 use super::key::Key;
 use super::rect::Rect;
@@ -90,8 +91,8 @@ impl<'a> Layout<'a> {
         let mut y = 0.0;
         let mut w = 1.0;
         let mut h = 1.0;
-        let mut background_color = "#cccccc".to_string();
-        let mut foreground_color = "#000000".to_string();
+        let mut background_color = Rgb::new(0xcc, 0xcc, 0xcc);
+        let mut foreground_color = Rgb::new(0x00, 0x00, 0x00);
 
         for entry in &self.physical.0 {
             if let PhysicalLayoutEntry::Row(row) = entry {
@@ -103,12 +104,16 @@ impl<'a> Layout<'a> {
                             y -= meta.y;
                             w = meta.w.unwrap_or(w);
                             h = meta.h.unwrap_or(h);
-                            background_color = meta.c.clone().unwrap_or(background_color);
+                            background_color = meta.c.as_ref().map(|c| {
+                                let err = format!("Failed to parse color {}", c);
+                                Rgb::parse(&c[1..]).expect(&err)
+                            }).unwrap_or(background_color);
                             if let Some(t) = &meta.t {
                                 //TODO: support using different color per line?
                                 //Is this even possible in GTK?
                                 if let Some(t_l) = t.lines().next() {
-                                    foreground_color = t_l.to_string();
+                                    let err = format!("Failed to parse color {}", t_l);
+                                    foreground_color = Rgb::parse(&t_l[1..]).expect(&err);
                                 }
                             }
                         }
@@ -140,8 +145,8 @@ impl<'a> Layout<'a> {
                                 electrical: electrical.clone(),
                                 electrical_name: format!("{}, {}", electrical.0, electrical.1),
                                 scancodes: RefCell::new(Vec::new()),
-                                background_color: background_color.clone(),
-                                foreground_color: foreground_color.clone(),
+                                background_color,
+                                foreground_color,
                             });
 
                             x += w;