From 7a97a64faa983b1de64dedb49bdbf34582f1f4c8 Mon Sep 17 00:00:00 2001 From: pml68 Date: Sun, 22 Sep 2024 19:42:08 +0200 Subject: feat: finish codegen --- src/types/mod.rs | 2 -- src/types/rendered_element.rs | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/types') diff --git a/src/types/mod.rs b/src/types/mod.rs index c837ee1..7a04d79 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -1,6 +1,5 @@ pub mod rendered_element; -use iced::widget::text_editor; use rendered_element::RenderedElement; use std::path::PathBuf; @@ -13,7 +12,6 @@ pub struct DesignerState { pub enum ElementName { Text(&'static str), Button(&'static str), - TextEditor(text_editor::Content), SVG(PathBuf), Image(PathBuf), Container, diff --git a/src/types/rendered_element.rs b/src/types/rendered_element.rs index cbc923d..f05594d 100644 --- a/src/types/rendered_element.rs +++ b/src/types/rendered_element.rs @@ -2,11 +2,13 @@ use std::collections::HashMap; use unique_id::{string::StringGenerator, Generator}; +use iced::advanced::widget::Id; + use super::ElementName; #[derive(Debug)] pub struct RenderedElement { - pub id: String, + pub id: Id, pub child_elements: Vec, pub name: ElementName, pub props: HashMap<&'static str, &'static str>, @@ -16,7 +18,7 @@ impl RenderedElement { pub fn new(name: ElementName) -> Self { let gen = StringGenerator::default(); Self { - id: gen.next_id(), + id: Id::new(gen.next_id()), child_elements: vec![], name, props: HashMap::new(), @@ -26,7 +28,7 @@ impl RenderedElement { pub fn from_vec(name: ElementName, child_elements: Vec) -> Self { let gen = StringGenerator::default(); Self { - id: gen.next_id(), + id: Id::new(gen.next_id()), child_elements, name, props: HashMap::new(), -- cgit v1.2.3