diff --git a/gui/window/main.xml b/gui/window/main.xml index 2a7986a10..72acc69f4 100644 --- a/gui/window/main.xml +++ b/gui/window/main.xml @@ -1,4 +1,4 @@ - + diff --git a/src/layout_abstract_types.rs b/src/layout_abstract_types.rs index 02e36732f..e2b7331d1 100644 --- a/src/layout_abstract_types.rs +++ b/src/layout_abstract_types.rs @@ -1,4 +1,5 @@ use crate::color::Color; +use crate::layout_abstract_syntax::*; #[derive(Debug)] pub struct VariableParameter { @@ -36,7 +37,7 @@ pub enum TypeValueOrArgument { #[derive(Debug)] pub enum TypeName { - // Layout, // TODO + Layout, Integer, Decimal, AbsolutePx, @@ -53,7 +54,7 @@ pub enum TypeName { #[derive(Debug)] pub enum TypeValue { - // Layout(()), // TODO + Layout(Vec>), Integer(i64), Decimal(f64), AbsolutePx(f32), diff --git a/src/layout_attribute_parser.rs b/src/layout_attribute_parser.rs index 4e76f5555..4ca4f1652 100644 --- a/src/layout_attribute_parser.rs +++ b/src/layout_attribute_parser.rs @@ -224,7 +224,7 @@ impl AttributeParser { // Return the case-insensitive TypeName enum for the individual type match &individual_type.to_ascii_lowercase()[..] { - // "layout" => TypeName::Layout, // TODO + "layout" => TypeName::Layout, "integer" => TypeName::Integer, "decimal" => TypeName::Decimal, "absolutepx" => TypeName::AbsolutePx,