feat: Inital code showing color in border

Author: ids1024

backend/src/board.rs

@@ -1,4 +1,8 @@
-use glib::subclass::prelude::*;
+use glib::{
+    prelude::*,
+    subclass::{prelude::*, Signal},
+};
+use once_cell::sync::Lazy;
 use std::{cell::Cell, collections::HashMap, rc::Rc};
 
 use crate::{BoardId, Daemon, DerefCell, Key, KeyMap, Layer, Layout};
@@ -16,7 +20,7 @@ pub struct DaemonBoardInner {
     keys: DerefCell<Vec<Key>>,
     layers: DerefCell<Vec<Layer>>,
     max_brightness: DerefCell<i32>,
-    pub(crate) leds_changed: Cell<bool>,
+    leds_changed: Cell<bool>,
     has_led_save: DerefCell<bool>,
     has_matrix: DerefCell<bool>,
 }
@@ -28,7 +32,14 @@ impl ObjectSubclass for DaemonBoardInner {
     type Type = DaemonBoard;
 }
 
-impl ObjectImpl for DaemonBoardInner {}
+impl ObjectImpl for DaemonBoardInner {
+    fn signals() -> &'static [Signal] {
+        static SIGNALS: Lazy<Vec<Signal>> = Lazy::new(|| {
+            vec![Signal::builder("leds-changed", &[], glib::Type::UNIT.into()).build()]
+        });
+        SIGNALS.as_ref()
+    }
+}
 
 glib::wrapper! {
     pub struct DaemonBoard(ObjectSubclass<DaemonBoardInner>);
@@ -69,8 +80,7 @@ impl DaemonBoard {
         self_.inner().has_matrix.set(has_matrix);
 
         let keys = self_
-            .inner()
-            .layout
+            .layout()
             .physical
             .keys
             .iter()
@@ -86,10 +96,23 @@ impl DaemonBoard {
         Ok(self_)
     }
 
-    pub(crate) fn inner(&self) -> &DaemonBoardInner {
+    fn inner(&self) -> &DaemonBoardInner {
         DaemonBoardInner::from_instance(self)
     }
 
+    pub(crate) fn set_leds_changed(&self) {
+        self.inner().leds_changed.set(true);
+        self.emit_by_name("leds-changed", &[]).unwrap();
+    }
+
+    pub fn connect_leds_changed<F: Fn() + 'static>(&self, cb: F) {
+        self.connect_local("leds-changed", false, move |_| {
+            cb();
+            None
+        })
+        .unwrap();
+    }
+
     pub(crate) fn daemon(&self) -> &dyn Daemon {
         self.inner().daemon.as_ref()
     }

backend/src/key.rs

@@ -138,7 +138,7 @@ impl Key {
             board.daemon().set_color(board.board(), *index, color)?;
         }
         self.led_color.set(Some(color));
-        board.inner().leds_changed.set(true);
+        board.set_leds_changed();
         Ok(())
     }
 

backend/src/layer.rs

@@ -71,7 +71,7 @@ impl Layer {
             .daemon()
             .set_mode(board.board(), self.layer, mode.index, speed)?;
         self.mode.set(Some((mode.index, speed)));
-        board.inner().leds_changed.set(true);
+        board.set_leds_changed();
         Ok(())
     }
 
@@ -85,7 +85,7 @@ impl Layer {
             .daemon()
             .set_brightness(board.board(), self.index, brightness)?;
         self.brightness.set(brightness);
-        board.inner().leds_changed.set(true);
+        board.set_leds_changed();
         Ok(())
     }
 
@@ -97,7 +97,7 @@ impl Layer {
         let board = self.board();
         board.daemon().set_color(board.board(), self.index, color)?;
         self.color.set(color);
-        board.inner().leds_changed.set(true);
+        board.set_leds_changed();
         Ok(())
     }
 }

src/application/keyboard_layer.rs

@@ -1,4 +1,5 @@
 use cascade::cascade;
+use glib::clone;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use std::{
@@ -8,7 +9,7 @@ use std::{
 
 use super::Page;
 use crate::{DerefCell, SelectedKeys};
-use backend::{DaemonBoard, Key, Rect, Rgb};
+use backend::{DaemonBoard, Key, Layer, Rect, Rgb};
 
 const SCALE: f64 = 64.0;
 const MARGIN: f64 = 2.;
@@ -82,12 +83,28 @@ impl WidgetImpl for KeyboardLayerInner {
     fn draw(&self, widget: &KeyboardLayer, cr: &cairo::Context) -> Inhibit {
         self.parent_draw(widget, cr);
 
+        let layer = widget.page().layer().map(|i| &self.board.layers()[i]);
+        let (is_per_key, has_hue) = layer
+            .and_then(Layer::mode)
+            .map(|x| (x.0.is_per_key(), x.0.has_hue))
+            .unwrap_or_default();
         let selected = Rgb::new(0xfb, 0xb8, 0x6c).to_floats();
+
         for (i, k) in widget.keys().iter().enumerate() {
             let Rect { x, y, w, h } = scale_rect(&k.physical);
 
             let mut bg = k.background_color.to_floats();
 
+            let border_color = layer.and_then(|layer| {
+                if is_per_key {
+                    k.color()
+                } else if has_hue {
+                    Some(layer.color())
+                } else {
+                    None
+                }
+            });
+
             if k.pressed() {
                 // Invert colors if pressed
                 bg.0 = 1.0 - bg.0;
@@ -116,6 +133,11 @@ impl WidgetImpl for KeyboardLayerInner {
                 cr.set_source_rgb(selected.0, selected.1, selected.2);
                 cr.set_line_width(4.);
                 cr.stroke();
+            } else if let Some(color) = border_color {
+                let color = color.to_rgb().to_floats();
+                cr.set_source_rgb(color.0, color.1, color.2);
+                cr.set_line_width(1.);
+                cr.stroke();
             }
 
             // Draw label
@@ -198,6 +220,7 @@ impl KeyboardLayer {
             glib::Object::new::<Self>(&[]).unwrap();
             ..set_size_request(width, height);
         };
+        board.connect_leds_changed(clone!(@weak obj => move || obj.queue_draw()));
         obj.inner().page.set(page);
         obj.inner().board.set(board);
         obj