From b619fb7a71b5e96446931d0afa6d51ef5724c12d Mon Sep 17 00:00:00 2001 From: Michael Mikovsky <77305074+Astatin3@users.noreply.github.com> Date: Sun, 28 Dec 2025 11:38:07 -0700 Subject: [PATCH] Work on interface --- unshell-gui/src/interface/interface.rs | 12 +++++++----- unshell-lib/src/config/config_struct.rs | 6 +++--- unshell-lib/src/config/tree.rs | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/unshell-gui/src/interface/interface.rs b/unshell-gui/src/interface/interface.rs index d79e648..8fb93fb 100644 --- a/unshell-gui/src/interface/interface.rs +++ b/unshell-gui/src/interface/interface.rs @@ -1,5 +1,7 @@ use egui::{Color32, TextEdit}; -use unshell_lib::config::{InterfaceData, InterfaceStruct, config_struct}; +use unshell_lib::config::{ConfigStructField, InterfaceData, InterfaceStruct, config_struct}; + +struct ConfigInterface(Config) pub fn render( ui: &mut egui::Ui, @@ -20,16 +22,16 @@ fn render_config_struct( ) { for (interface, data) in interface.iter().zip(data) { match (interface, data) { - (config_struct::ConfigStructField::Header(text), serde_json::Value::Null) => { + (ConfigStructField::Header(text), serde_json::Value::Null) => { ui.heading(text); } - (config_struct::ConfigStructField::Text(text), serde_json::Value::Null) => { + (ConfigStructField::Text(text), serde_json::Value::Null) => { ui.label(text); } ( - config_struct::ConfigStructField::String { + ConfigStructField::String { default: _, max_length, protected, @@ -63,7 +65,7 @@ fn render_config_struct( }); } ( - config_struct::ConfigStructField::Integer { default, min, max }, + ConfigStructField::Integer { default, min, max }, serde_json::Value::Number(number), ) => todo!(), diff --git a/unshell-lib/src/config/config_struct.rs b/unshell-lib/src/config/config_struct.rs index 068bd12..5194620 100644 --- a/unshell-lib/src/config/config_struct.rs +++ b/unshell-lib/src/config/config_struct.rs @@ -36,9 +36,9 @@ impl Config { Ok(TreeMessage::Success) } - TreeMessage::RequestStruct => Ok(TreeMessage::Interface( - InterfaceStruct::ConfigStruct(self.keys.clone()), - )), + // TreeMessage::RequestStruct => Ok(TreeMessage::Interface( + // InterfaceStruct::ConfigStruct(self.keys.clone()), + // )), TreeMessage::RequestState => Ok(TreeMessage::State(InterfaceData::ConfigStruct( self.values.clone(), ))), diff --git a/unshell-lib/src/config/tree.rs b/unshell-lib/src/config/tree.rs index cafaabb..a6902a3 100644 --- a/unshell-lib/src/config/tree.rs +++ b/unshell-lib/src/config/tree.rs @@ -55,7 +55,7 @@ pub enum TreeMessage { RequestStructAndValue, State(InterfaceData), - Interface(InterfaceStruct), + // Interface(InterfaceStruct), InterfaceAndValue(InterfaceStruct, InterfaceData), Success,