diff --git a/Cargo.toml b/Cargo.toml
index f97d435..e567d1b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
[profile.dev]
-opt-level = 0
+opt-level = 1
debug = true
strip = "none"
debug-assertions = true
diff --git a/uidev/assets/gui/various_widgets.xml b/uidev/assets/gui/various_widgets.xml
new file mode 100644
index 0000000..16e0db6
--- /dev/null
+++ b/uidev/assets/gui/various_widgets.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uidev/src/testbed/testbed_generic.rs b/uidev/src/testbed/testbed_generic.rs
index ff40436..ac43c1a 100644
--- a/uidev/src/testbed/testbed_generic.rs
+++ b/uidev/src/testbed/testbed_generic.rs
@@ -1,93 +1,24 @@
-use std::{cell::RefCell, rc::Rc};
-
-use glam::{Mat4, Vec2};
-use wgui::{
- drawing::{self},
- event::{EventListenerCollection, EventListenerKind},
- layout::{Layout, WidgetID},
- renderer_vk::text::TextStyle,
-};
-
use crate::{assets, testbed::Testbed};
+use glam::Vec2;
+use wgui::{event::EventListenerCollection, layout::Layout};
pub struct TestbedGeneric {
pub layout: Layout,
- rot: f32,
- widget_id: Rc>>,
}
impl TestbedGeneric {
pub fn new(listeners: &mut EventListenerCollection<(), ()>) -> anyhow::Result {
const XML_PATH: &str = "gui/testbed.xml";
- let (mut layout, res) =
+ let (layout, _res) =
wgui::parser::new_layout_from_assets(Box::new(assets::Asset {}), XML_PATH)?;
- use wgui::components::button;
- let my_div_parent = res.require_by_id("my_div_parent")?;
- // create some buttons for testing
- for i in 0..4 {
- let n = i as f32 / 4.0;
- button::construct(
- &mut layout,
- my_div_parent,
- button::Params {
- text: "I'm a button!",
- color: drawing::Color::new(1.0 - n, n * n, n, 1.0),
- ..Default::default()
- },
- )?;
- }
-
- let button = button::construct(
- &mut layout,
- my_div_parent,
- button::Params {
- text: "Click me!!",
- color: drawing::Color::new(0.2, 0.2, 0.2, 1.0),
- size: Vec2::new(256.0, 64.0),
- text_style: TextStyle {
- size: Some(30.0),
- ..Default::default()
- },
- },
- )?;
-
- let widget_id = Rc::new(RefCell::new(None));
-
- let wid = widget_id.clone();
- listeners.add(
- button.body,
- EventListenerKind::MouseRelease,
- Box::new(move |data, (), ()| {
- button.set_text(data, "Congratulations!");
- *wid.borrow_mut() = Some(data.widget_id);
- }),
- );
-
- Ok(Self {
- layout,
- rot: 0.0,
- widget_id,
- })
+ Ok(Self { layout })
}
}
impl Testbed for TestbedGeneric {
fn update(&mut self, width: f32, height: f32, timestep_alpha: f32) -> anyhow::Result<()> {
- if let Some(widget_id) = *self.widget_id.borrow() {
- self.rot += 0.01;
-
- let a = self.layout.widget_map.get(widget_id).unwrap();
- let mut widget = a.lock().unwrap();
- widget.data.transform = Mat4::IDENTITY
- * Mat4::from_rotation_y(-self.rot)
- * Mat4::from_rotation_x(self.rot * 0.25)
- * Mat4::from_rotation_z(-self.rot * 0.1);
-
- self.layout.needs_redraw = true;
- }
-
self.layout
.update(Vec2::new(width, height), timestep_alpha)?;
Ok(())
diff --git a/wgui/src/components/button.rs b/wgui/src/components/button.rs
index a6eb0ac..ebba0e6 100644
--- a/wgui/src/components/button.rs
+++ b/wgui/src/components/button.rs
@@ -1,10 +1,9 @@
use std::sync::Arc;
-
-use glam::Vec2;
use taffy::{AlignItems, JustifyContent, prelude::length};
use crate::{
animation::{Animation, AnimationEasing},
+ components::Component,
drawing::{self, Color},
event::WidgetCallback,
layout::{Layout, WidgetID},
@@ -19,7 +18,9 @@ use crate::{
pub struct Params<'a> {
pub text: &'a str,
pub color: drawing::Color,
- pub size: Vec2,
+ pub border_color: drawing::Color,
+ pub round: WLength,
+ pub style: taffy::Style,
pub text_style: TextStyle,
}
@@ -28,19 +29,23 @@ impl Default for Params<'_> {
Self {
text: "Text",
color: drawing::Color::new(1.0, 1.0, 1.0, 1.0),
- size: Vec2::new(128.0, 32.0),
+ border_color: drawing::Color::new(0.0, 0.0, 0.0, 1.0),
+ round: WLength::Units(4.0),
+ style: Default::default(),
text_style: TextStyle::default(),
}
}
}
pub struct Button {
- color: drawing::Color,
+ pub color: drawing::Color,
pub body: WidgetID, // Rectangle
pub text_id: WidgetID, // Text
text_node: taffy::NodeId,
}
+impl Component for Button {}
+
impl Button {
pub fn set_text<'a, C>(&self, callback_data: &mut C, text: &str)
where
@@ -95,23 +100,23 @@ pub fn construct(
parent: WidgetID,
params: Params,
) -> anyhow::Result> {
+ let mut style = params.style;
+
+ // force-override style
+ style.align_items = Some(AlignItems::Center);
+ style.justify_content = Some(JustifyContent::Center);
+ style.padding = length(1.0);
+
let (rect_id, _) = layout.add_child(
parent,
Rectangle::create(RectangleParams {
color: params.color,
- round: WLength::Units(4.0),
+ round: params.round,
+ border_color: params.border_color,
+ border: 2.0,
..Default::default()
})?,
- taffy::Style {
- size: taffy::Size {
- width: length(params.size.x),
- height: length(params.size.y),
- },
- align_items: Some(AlignItems::Center),
- justify_content: Some(JustifyContent::Center),
- padding: length(1.0),
- ..Default::default()
- },
+ style,
)?;
let light_text = (params.color.r + params.color.g + params.color.b) < 1.5;
diff --git a/wgui/src/components/mod.rs b/wgui/src/components/mod.rs
index aa200ca..23d40bc 100644
--- a/wgui/src/components/mod.rs
+++ b/wgui/src/components/mod.rs
@@ -1 +1,5 @@
+use crate::any::AnyTrait;
+
pub mod button;
+
+pub trait Component: AnyTrait {}
diff --git a/wgui/src/parser/component_button.rs b/wgui/src/parser/component_button.rs
new file mode 100644
index 0000000..0d388d9
--- /dev/null
+++ b/wgui/src/parser/component_button.rs
@@ -0,0 +1,60 @@
+use crate::{
+ components::button,
+ drawing::Color,
+ layout::WidgetID,
+ parser::{
+ ParserContext, ParserFile, iter_attribs,
+ style::{parse_color, parse_round, parse_style, parse_text_style},
+ },
+ widget::util::WLength,
+};
+
+pub fn parse_component_button<'a>(
+ file: &'a ParserFile,
+ ctx: &mut ParserContext,
+ node: roxmltree::Node<'a, 'a>,
+ parent_id: WidgetID,
+) -> anyhow::Result<()> {
+ let mut color = Color::new(1.0, 1.0, 1.0, 1.0);
+ let mut border_color = Color::new(0.0, 0.0, 0.0, 1.0);
+ let mut round = WLength::Units(4.0);
+
+ let mut text = String::default();
+
+ let attribs: Vec<_> = iter_attribs(file, ctx, &node, false).collect();
+ let text_style = parse_text_style(&attribs);
+ let style = parse_style(&attribs);
+
+ for (key, value) in attribs {
+ match key.as_ref() {
+ "text" => {
+ text = String::from(value.as_ref());
+ }
+ "round" => {
+ parse_round(&value, &mut round);
+ }
+ "color" => {
+ parse_color(&value, &mut color);
+ }
+ "border_color" => {
+ parse_color(&value, &mut border_color);
+ }
+ _ => {}
+ }
+ }
+
+ let button = button::construct(
+ ctx.layout,
+ parent_id,
+ button::Params {
+ color,
+ border_color,
+ text: &text,
+ style,
+ text_style,
+ round,
+ },
+ )?;
+
+ Ok(())
+}
diff --git a/wgui/src/parser/mod.rs b/wgui/src/parser/mod.rs
index dd0d679..a500322 100644
--- a/wgui/src/parser/mod.rs
+++ b/wgui/src/parser/mod.rs
@@ -1,3 +1,4 @@
+mod component_button;
mod style;
mod widget_div;
mod widget_label;
@@ -9,8 +10,9 @@ use crate::{
drawing::{self},
layout::{Layout, WidgetID},
parser::{
- widget_div::parse_widget_div, widget_label::parse_widget_label,
- widget_rectangle::parse_widget_rectangle, widget_sprite::parse_widget_sprite,
+ component_button::parse_component_button, widget_div::parse_widget_div,
+ widget_label::parse_widget_label, widget_rectangle::parse_widget_rectangle,
+ widget_sprite::parse_widget_sprite,
},
};
use ouroboros::self_referencing;
@@ -543,6 +545,9 @@ fn parse_children<'a>(
"sprite" => {
parse_widget_sprite(file, ctx, child_node, parent_id)?;
}
+ "button" => {
+ parse_component_button(file, ctx, child_node, parent_id)?;
+ }
"" => { /* ignore */ }
other_tag_name => {
parse_widget_other(other_tag_name, file, ctx, child_node, parent_id)?;
diff --git a/wgui/src/parser/style.rs b/wgui/src/parser/style.rs
index e99e174..cb39040 100644
--- a/wgui/src/parser/style.rs
+++ b/wgui/src/parser/style.rs
@@ -1,75 +1,140 @@
+use std::rc::Rc;
+
use taffy::{
AlignContent, AlignItems, AlignSelf, BoxSizing, Display, FlexDirection, FlexWrap, JustifyContent,
JustifySelf, Overflow,
};
-use crate::parser::{
- ParserContext, ParserFile, iter_attribs, parse_size_unit, parse_val, print_invalid_attrib,
+use crate::{
+ drawing,
+ parser::{
+ is_percent, parse_color_hex, parse_f32, parse_percent, parse_size_unit, parse_val,
+ print_invalid_attrib, print_invalid_value,
+ },
+ renderer_vk::text::{FontWeight, HorizontalAlign, TextStyle},
+ widget::util::WLength,
};
-pub fn style_from_node<'a>(
- file: &'a ParserFile,
- ctx: &ParserContext,
- node: roxmltree::Node<'a, 'a>,
-) -> taffy::Style {
+pub fn parse_round(value: &str, round: &mut WLength) {
+ if is_percent(value) {
+ if let Some(val) = parse_percent(value) {
+ *round = WLength::Percent(val);
+ } else {
+ print_invalid_value(value);
+ }
+ } else if let Some(val) = parse_f32(value) {
+ *round = WLength::Units(val);
+ } else {
+ print_invalid_value(value);
+ }
+}
+
+pub fn parse_color(value: &str, color: &mut drawing::Color) {
+ if let Some(res_color) = parse_color_hex(value) {
+ *color = res_color;
+ } else {
+ print_invalid_value(value);
+ }
+}
+
+pub fn parse_text_style(attribs: &[(Rc, Rc)]) -> TextStyle {
+ let mut style = TextStyle::default();
+
+ for (key, value) in attribs {
+ match key.as_ref() {
+ "color" => {
+ if let Some(color) = parse_color_hex(value) {
+ style.color = Some(color);
+ }
+ }
+ "align" => match value.as_ref() {
+ "left" => style.align = Some(HorizontalAlign::Left),
+ "right" => style.align = Some(HorizontalAlign::Right),
+ "center" => style.align = Some(HorizontalAlign::Center),
+ "justified" => style.align = Some(HorizontalAlign::Justified),
+ "end" => style.align = Some(HorizontalAlign::End),
+ _ => {
+ print_invalid_attrib(key, value);
+ }
+ },
+ "weight" => match value.as_ref() {
+ "normal" => style.weight = Some(FontWeight::Normal),
+ "bold" => style.weight = Some(FontWeight::Bold),
+ _ => {
+ print_invalid_attrib(key, value);
+ }
+ },
+ "size" => {
+ if let Ok(size) = value.parse::() {
+ style.size = Some(size);
+ } else {
+ print_invalid_attrib(key, value);
+ }
+ }
+ _ => {}
+ }
+ }
+
+ style
+}
+
+pub fn parse_style(attribs: &[(Rc, Rc)]) -> taffy::Style {
let mut style = taffy::Style {
..Default::default()
};
- let attribs: Vec<_> = iter_attribs(file, ctx, &node, false).collect();
-
for (key, value) in attribs {
- match &*key {
- "display" => match &*value {
+ match key.as_ref() {
+ "display" => match value.as_ref() {
"flex" => style.display = Display::Flex,
"block" => style.display = Display::Block,
"grid" => style.display = Display::Grid,
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
"margin_left" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.margin.left = dim;
}
}
"margin_right" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.margin.right = dim;
}
}
"margin_top" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.margin.top = dim;
}
}
"margin_bottom" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.margin.bottom = dim;
}
}
"padding_left" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.padding.left = dim;
}
}
"padding_right" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.padding.right = dim;
}
}
"padding_top" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.padding.top = dim;
}
}
"padding_bottom" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.padding.bottom = dim;
}
}
"margin" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.margin.left = dim;
style.margin.right = dim;
style.margin.top = dim;
@@ -77,14 +142,14 @@ pub fn style_from_node<'a>(
}
}
"padding" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.padding.left = dim;
style.padding.right = dim;
style.padding.top = dim;
style.padding.bottom = dim;
}
}
- "overflow" => match &*value {
+ "overflow" => match value.as_ref() {
"hidden" => {
style.overflow.x = Overflow::Hidden;
style.overflow.y = Overflow::Hidden;
@@ -102,92 +167,92 @@ pub fn style_from_node<'a>(
style.overflow.y = Overflow::Scroll;
}
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
- "overflow_x" => match &*value {
+ "overflow_x" => match value.as_ref() {
"hidden" => style.overflow.x = Overflow::Hidden,
"visible" => style.overflow.x = Overflow::Visible,
"clip" => style.overflow.x = Overflow::Clip,
"scroll" => style.overflow.x = Overflow::Scroll,
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
- "overflow_y" => match &*value {
+ "overflow_y" => match value.as_ref() {
"hidden" => style.overflow.y = Overflow::Hidden,
"visible" => style.overflow.y = Overflow::Visible,
"clip" => style.overflow.y = Overflow::Clip,
"scroll" => style.overflow.y = Overflow::Scroll,
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
"min_width" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.min_size.width = dim;
}
}
"min_height" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.min_size.height = dim;
}
}
"max_width" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.max_size.width = dim;
}
}
"max_height" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.max_size.height = dim;
}
}
"width" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.size.width = dim;
}
}
"height" => {
- if let Some(dim) = parse_size_unit(&value) {
+ if let Some(dim) = parse_size_unit(value) {
style.size.height = dim;
}
}
"gap" => {
- if let Some(val) = parse_size_unit(&value) {
+ if let Some(val) = parse_size_unit(value) {
style.gap = val;
}
}
"flex_basis" => {
- if let Some(val) = parse_size_unit(&value) {
+ if let Some(val) = parse_size_unit(value) {
style.flex_basis = val;
}
}
"flex_grow" => {
- if let Some(val) = parse_val(&value) {
+ if let Some(val) = parse_val(value) {
style.flex_grow = val;
}
}
"flex_shrink" => {
- if let Some(val) = parse_val(&value) {
+ if let Some(val) = parse_val(value) {
style.flex_shrink = val;
}
}
- "position" => match &*value {
+ "position" => match value.as_ref() {
"absolute" => style.position = taffy::Position::Absolute,
"relative" => style.position = taffy::Position::Relative,
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
- "box_sizing" => match &*value {
+ "box_sizing" => match value.as_ref() {
"border_box" => style.box_sizing = BoxSizing::BorderBox,
"content_box" => style.box_sizing = BoxSizing::ContentBox,
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
- "align_self" => match &*value {
+ "align_self" => match value.as_ref() {
"baseline" => style.align_self = Some(AlignSelf::Baseline),
"center" => style.align_self = Some(AlignSelf::Center),
"end" => style.align_self = Some(AlignSelf::End),
@@ -196,10 +261,10 @@ pub fn style_from_node<'a>(
"start" => style.align_self = Some(AlignSelf::Start),
"stretch" => style.align_self = Some(AlignSelf::Stretch),
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
- "justify_self" => match &*value {
+ "justify_self" => match value.as_ref() {
"center" => style.justify_self = Some(JustifySelf::Center),
"end" => style.justify_self = Some(JustifySelf::End),
"flex_end" => style.justify_self = Some(JustifySelf::FlexEnd),
@@ -207,10 +272,10 @@ pub fn style_from_node<'a>(
"start" => style.justify_self = Some(JustifySelf::Start),
"stretch" => style.justify_self = Some(JustifySelf::Stretch),
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
- "align_items" => match &*value {
+ "align_items" => match value.as_ref() {
"baseline" => style.align_items = Some(AlignItems::Baseline),
"center" => style.align_items = Some(AlignItems::Center),
"end" => style.align_items = Some(AlignItems::End),
@@ -219,10 +284,10 @@ pub fn style_from_node<'a>(
"start" => style.align_items = Some(AlignItems::Start),
"stretch" => style.align_items = Some(AlignItems::Stretch),
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
- "align_content" => match &*value {
+ "align_content" => match value.as_ref() {
"center" => style.align_content = Some(AlignContent::Center),
"end" => style.align_content = Some(AlignContent::End),
"flex_end" => style.align_content = Some(AlignContent::FlexEnd),
@@ -233,10 +298,10 @@ pub fn style_from_node<'a>(
"start" => style.align_content = Some(AlignContent::Start),
"stretch" => style.align_content = Some(AlignContent::Stretch),
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
- "justify_content" => match &*value {
+ "justify_content" => match value.as_ref() {
"center" => style.justify_content = Some(JustifyContent::Center),
"end" => style.justify_content = Some(JustifyContent::End),
"flex_end" => style.justify_content = Some(JustifyContent::FlexEnd),
@@ -247,22 +312,22 @@ pub fn style_from_node<'a>(
"start" => style.justify_content = Some(JustifyContent::Start),
"stretch" => style.justify_content = Some(JustifyContent::Stretch),
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
- "flex_wrap" => match &*value {
+ "flex_wrap" => match value.as_ref() {
"wrap" => style.flex_wrap = FlexWrap::Wrap,
"no_wrap" => style.flex_wrap = FlexWrap::NoWrap,
"wrap_reverse" => style.flex_wrap = FlexWrap::WrapReverse,
_ => {}
},
- "flex_direction" => match &*value {
+ "flex_direction" => match value.as_ref() {
"column_reverse" => style.flex_direction = FlexDirection::ColumnReverse,
"column" => style.flex_direction = FlexDirection::Column,
"row_reverse" => style.flex_direction = FlexDirection::RowReverse,
"row" => style.flex_direction = FlexDirection::Row,
_ => {
- print_invalid_attrib(&key, &value);
+ print_invalid_attrib(key, value);
}
},
_ => {}
diff --git a/wgui/src/parser/widget_div.rs b/wgui/src/parser/widget_div.rs
index 0e00e3e..7cc35aa 100644
--- a/wgui/src/parser/widget_div.rs
+++ b/wgui/src/parser/widget_div.rs
@@ -1,6 +1,8 @@
use crate::{
layout::WidgetID,
- parser::{ParserContext, ParserFile, parse_children, parse_universal, style::style_from_node},
+ parser::{
+ ParserContext, ParserFile, iter_attribs, parse_children, parse_universal, style::parse_style,
+ },
widget,
};
@@ -10,7 +12,8 @@ pub fn parse_widget_div<'a>(
node: roxmltree::Node<'a, 'a>,
parent_id: WidgetID,
) -> anyhow::Result<()> {
- let style = style_from_node(file, ctx, node);
+ let attribs: Vec<_> = iter_attribs(file, ctx, &node, false).collect();
+ let style = parse_style(&attribs);
let (new_id, _) = ctx
.layout
diff --git a/wgui/src/parser/widget_label.rs b/wgui/src/parser/widget_label.rs
index 1b8a852..289d7cc 100644
--- a/wgui/src/parser/widget_label.rs
+++ b/wgui/src/parser/widget_label.rs
@@ -1,10 +1,9 @@
use crate::{
layout::WidgetID,
parser::{
- ParserContext, ParserFile, iter_attribs, parse_children, parse_color_hex, parse_universal,
- print_invalid_attrib, style::style_from_node,
+ ParserContext, ParserFile, iter_attribs, parse_children, parse_universal,
+ style::{parse_style, parse_text_style},
},
- renderer_vk::text::{FontWeight, HorizontalAlign},
widget::text::{TextLabel, TextParams},
};
@@ -16,46 +15,19 @@ pub fn parse_widget_label<'a>(
) -> anyhow::Result<()> {
let mut params = TextParams::default();
let attribs: Vec<_> = iter_attribs(file, ctx, &node, false).collect();
+
+ let style = parse_style(&attribs);
+ params.style = parse_text_style(&attribs);
+
for (key, value) in attribs {
match &*key {
"text" => {
params.content = String::from(value.as_ref());
}
- "color" => {
- if let Some(color) = parse_color_hex(&value) {
- params.style.color = Some(color);
- }
- }
- "align" => match &*value {
- "left" => params.style.align = Some(HorizontalAlign::Left),
- "right" => params.style.align = Some(HorizontalAlign::Right),
- "center" => params.style.align = Some(HorizontalAlign::Center),
- "justified" => params.style.align = Some(HorizontalAlign::Justified),
- "end" => params.style.align = Some(HorizontalAlign::End),
- _ => {
- print_invalid_attrib(&key, &value);
- }
- },
- "weight" => match &*value {
- "normal" => params.style.weight = Some(FontWeight::Normal),
- "bold" => params.style.weight = Some(FontWeight::Bold),
- _ => {
- print_invalid_attrib(&key, &value);
- }
- },
- "size" => {
- if let Ok(size) = value.parse::() {
- params.style.size = Some(size);
- } else {
- print_invalid_attrib(&key, &value);
- }
- }
_ => {}
}
}
- let style = style_from_node(file, ctx, node);
-
let (new_id, _) = ctx
.layout
.add_child(parent_id, TextLabel::create(params)?, style)?;
diff --git a/wgui/src/parser/widget_rectangle.rs b/wgui/src/parser/widget_rectangle.rs
index 566d747..ee83922 100644
--- a/wgui/src/parser/widget_rectangle.rs
+++ b/wgui/src/parser/widget_rectangle.rs
@@ -2,11 +2,10 @@ use crate::{
drawing::GradientMode,
layout::WidgetID,
parser::{
- ParserContext, ParserFile, is_percent, iter_attribs, parse_children, parse_color_hex,
- parse_f32, parse_percent, parse_universal, print_invalid_attrib, print_invalid_value,
- style::style_from_node,
+ ParserContext, ParserFile, iter_attribs, parse_children, parse_universal, print_invalid_attrib,
+ style::{parse_color, parse_round, parse_style},
},
- widget::{self, rectangle::RectangleParams, util::WLength},
+ widget::{self, rectangle::RectangleParams},
};
pub fn parse_widget_rectangle<'a>(
@@ -17,22 +16,15 @@ pub fn parse_widget_rectangle<'a>(
) -> anyhow::Result<()> {
let mut params = RectangleParams::default();
let attribs: Vec<_> = iter_attribs(file, ctx, &node, false).collect();
+ let style = parse_style(&attribs);
for (key, value) in attribs {
match &*key {
"color" => {
- if let Some(color) = parse_color_hex(&value) {
- params.color = color;
- } else {
- print_invalid_attrib(&key, &value);
- }
+ parse_color(&value, &mut params.color);
}
"color2" => {
- if let Some(color) = parse_color_hex(&value) {
- params.color2 = color;
- } else {
- print_invalid_attrib(&key, &value);
- }
+ parse_color(&value, &mut params.color2);
}
"gradient" => {
params.gradient = match &*value {
@@ -47,17 +39,7 @@ pub fn parse_widget_rectangle<'a>(
}
}
"round" => {
- if is_percent(&value) {
- if let Some(val) = parse_percent(&value) {
- params.round = WLength::Percent(val);
- } else {
- print_invalid_value(&value);
- }
- } else if let Some(val) = parse_f32(&value) {
- params.round = WLength::Units(val);
- } else {
- print_invalid_value(&value);
- }
+ parse_round(&value, &mut params.round);
}
"border" => {
params.border = value.parse().unwrap_or_else(|_| {
@@ -66,18 +48,12 @@ pub fn parse_widget_rectangle<'a>(
});
}
"border_color" => {
- if let Some(color) = parse_color_hex(&value) {
- params.border_color = color;
- } else {
- print_invalid_attrib(&key, &value);
- }
+ parse_color(&value, &mut params.border_color);
}
_ => {}
}
}
- let style = style_from_node(file, ctx, node);
-
let (new_id, _) = ctx.layout.add_child(
parent_id,
widget::rectangle::Rectangle::create(params)?,
diff --git a/wgui/src/parser/widget_sprite.rs b/wgui/src/parser/widget_sprite.rs
index 2899719..cbdf79f 100644
--- a/wgui/src/parser/widget_sprite.rs
+++ b/wgui/src/parser/widget_sprite.rs
@@ -1,8 +1,7 @@
use crate::{
layout::WidgetID,
parser::{
- ParserContext, ParserFile, iter_attribs, parse_children, parse_universal,
- style::style_from_node,
+ ParserContext, ParserFile, iter_attribs, parse_children, parse_universal, style::parse_style,
},
renderer_vk::text::custom_glyph::{CustomGlyphContent, CustomGlyphData},
widget::sprite::{SpriteBox, SpriteBoxParams},
@@ -18,6 +17,7 @@ pub fn parse_widget_sprite<'a>(
) -> anyhow::Result<()> {
let mut params = SpriteBoxParams::default();
let attribs: Vec<_> = iter_attribs(file, ctx, &node, false).collect();
+ let style = parse_style(&attribs);
let mut glyph = None;
for (key, value) in attribs {
@@ -53,8 +53,6 @@ pub fn parse_widget_sprite<'a>(
log::warn!("No source for sprite node!");
};
- let style = style_from_node(file, ctx, node);
-
let (new_id, _) = ctx
.layout
.add_child(parent_id, SpriteBox::create(params)?, style)?;