chore: Use &Mode instead of u8 in backend UI

Author: ids1024

backend/src/layer.rs

@@ -1,6 +1,6 @@
 use std::cell::Cell;
 
-use crate::{DaemonBoard, DaemonBoardWeak, Hs};
+use crate::{DaemonBoard, DaemonBoardWeak, Hs, Mode};
 
 #[derive(Debug)]
 pub struct Layer {
@@ -62,17 +62,18 @@ impl Layer {
         self.board.upgrade().unwrap()
     }
 
-    pub fn mode(&self) -> Option<(u8, u8)> {
-        self.mode.get()
+    pub fn mode(&self) -> Option<(&'static Mode, u8)> {
+        let (index, speed) = self.mode.get()?;
+        Some((Mode::from_index(index)?, speed))
     }
 
-    pub fn set_mode(&self, mode: u8, speed: u8) -> Result<(), String> {
+    pub fn set_mode(&self, mode: &Mode, speed: u8) -> Result<(), String> {
         let board = self.board();
         board
             .0
             .daemon
-            .set_mode(board.0.board, self.layer, mode, speed)?;
-        self.mode.set(Some((mode, speed)));
+            .set_mode(board.0.board, self.layer, mode.index, speed)?;
+        self.mode.set(Some((mode.index, speed)));
         board.0.leds_changed.set(true);
         Ok(())
     }

src/application/backlight.rs

@@ -287,7 +287,7 @@ impl Backlight {
 
         let speed = self.inner().speed_scale.get_value();
         let layer = &self.board().layers()[self.inner().layer.get() as usize];
-        if let Err(err) = layer.set_mode(self.mode().index, speed as u8) {
+        if let Err(err) = layer.set_mode(self.mode(), speed as u8) {
             error!("Error setting keyboard mode: {}", err);
         }
     }
@@ -310,13 +310,12 @@ impl Backlight {
 
         let layer = &self.board().layers()[layer as usize];
 
-        let (mode, speed) = layer.mode().unwrap_or((0, 128));
-        let mode = Mode::from_index(mode).map(|x| x.id);
+        let (mode, speed) = layer.mode().unwrap_or((&Mode::all()[0], 128));
         let brightness = layer.brightness() as f64;
 
         self.inner().do_not_set.set(true);
 
-        self.inner().mode_combobox.set_active_id(mode);
+        self.inner().mode_combobox.set_active_id(Some(mode.id));
         self.inner().speed_scale.set_value(speed.into());
         self.inner().brightness_scale.set_value(brightness);
         if !self.mode().is_per_key() {

src/choose_color.rs

@@ -3,7 +3,7 @@ use glib::clone;
 use gtk::prelude::*;
 
 use crate::ColorWheel;
-use backend::{DaemonBoard, Hs};
+use backend::{DaemonBoard, Hs, Mode};
 
 pub fn choose_color<W: IsA<gtk::Widget>, F: Fn(Option<Hs>) + 'static>(
     board: DaemonBoard,
@@ -17,7 +17,7 @@ pub fn choose_color<W: IsA<gtk::Widget>, F: Fn(Option<Hs>) + 'static>(
     let original_mode = layer.mode();
 
     if original_mode.is_some() {
-        if let Err(err) = layer.set_mode(0, 0) {
+        if let Err(err) = layer.set_mode(&Mode::all()[0], 0) {
             error!("Failed to set keyboard mode: {}", err);
         }
     }