feat: Use KeyboardColorButton in configurator

Author: ids1024

src/application/keyboard.rs

@@ -16,8 +16,9 @@ use std::{
     },
 };
 
-use crate::color::Rgb;
 use crate::daemon::Daemon;
+use crate::keyboard::Keyboard as ColorKeyboard;
+use crate::keyboard_color_button::KeyboardColorButton;
 use super::key::Key;
 use super::picker::Picker;
 use super::rect::Rect;
@@ -456,18 +457,14 @@ button {
             gdk::RGBA::black()
         };
 
-        let color_button = gtk::ColorButton::with_rgba(&color_rgba);
-        color_button.set_halign(gtk::Align::Fill);
-        let kb = self.clone();
-        color_button.connect_color_set(move |this| {
-            let rgba = this.get_rgba();
-            let color = Rgb::from_floats(rgba.red, rgba.green, rgba.blue);
-            if let Some(ref daemon) = kb.daemon_opt {
-                if let Err(err) = daemon.set_color(kb.daemon_board, color) {
-                    eprintln!("{}", err);
-                }
-            }
-        });
+        let color_keyboard = if let Some(ref daemon) = self.daemon_opt {
+            ColorKeyboard::new_daemon(daemon.clone(), self.daemon_board)
+        } else {
+
+            ColorKeyboard::new_dummy()
+        };
+        let color_button = KeyboardColorButton::new(color_keyboard).widget().clone();
+        color_button.set_valign(gtk::Align::Center);
 
         for page in &[
             "Layer 1",

src/keyboard.rs

@@ -11,6 +11,7 @@ use std::iter::Iterator;
 use std::rc::{Rc, Weak};
 
 use crate::color::Rgb;
+use crate::daemon::Daemon;
 
 const DBUS_NAME: &'static str = "com.system76.PowerDaemon";
 const DBUS_KEYBOARD_IFACE: &'static str = "com.system76.PowerDaemon.Keyboard";
@@ -32,6 +33,10 @@ enum KeyboardImplementation {
     Dummy {
         properties: HashMap<&'static str, RefCell<Variant>>,
     },
+    Daemon {
+        daemon: Rc<dyn Daemon>,
+        board: usize,
+    }
 }
 
 struct KeyboardInner {
@@ -144,7 +149,14 @@ impl Keyboard {
         keyboard
     }
 
-    fn new_dummy() -> Self {
+    pub(crate) fn new_daemon(daemon: Rc<dyn Daemon>, board: usize) -> Self {
+        Self::new(KeyboardImplementation::Daemon {
+            daemon,
+            board,
+        })
+    }
+
+    pub(crate) fn new_dummy() -> Self {
         let mut properties = HashMap::new();
         properties.insert("max_brightness", RefCell::new(100i32.to_variant()));
         properties.insert("brightness", RefCell::new(0i32.to_variant()));
@@ -179,6 +191,7 @@ impl Keyboard {
                     .unwrap();
             }
             KeyboardImplementation::Dummy { .. } => {}
+            KeyboardImplementation::Daemon { .. } => {}
         }
     }
 
@@ -191,6 +204,15 @@ impl Keyboard {
             KeyboardImplementation::Dummy { properties } => {
                 Ok(Some(properties.get(name).unwrap().borrow().clone()))
             }
+            KeyboardImplementation::Daemon { ref daemon, board } => {
+                match name {
+                    "max-brightness" => daemon.max_brightness(*board).map(|b| Some(b.to_variant())).map_err(Error::msg),
+                    "brightness" => daemon.brightness(*board).map(|b| Some(b.to_variant())).map_err(Error::msg),
+                    "color" => daemon.color(*board).map(|b| Some(b.to_string().to_variant())).map_err(Error::msg),
+                    "name" => Ok(Some("".to_variant())),
+                    _ => unreachable!(),
+                }
+            }
         }
     }
 
@@ -205,6 +227,13 @@ impl Keyboard {
             KeyboardImplementation::Dummy { properties } => {
                 *properties.get(name).unwrap().borrow_mut() = value;
             }
+            KeyboardImplementation::Daemon { ref daemon, board } => {
+                match name {
+                    "brightness" => daemon.set_brightness(*board, value.get().unwrap()).map_err(Error::msg)?,
+                    "color" => daemon.set_color(*board, Rgb::parse(&value.get::<String>().unwrap()).unwrap()).map_err(Error::msg)?,
+                    _ => unreachable!(),
+                };
+            }
         }
         Ok(())
     }