summaryrefslogtreecommitdiff
path: root/iced_builder/src
diff options
context:
space:
mode:
authorpml68 <contact@pml68.me>2024-10-25 23:37:42 +0200
committerpml68 <contact@pml68.me>2024-10-25 23:37:42 +0200
commit0e3a2a2f0b9bae9e3871a8bf49f885fd0ef7df1b (patch)
tree323550c13dc92e34419f821d3733f1048e185296 /iced_builder/src
parentrefactor: extract views from `main.rs` file (diff)
downloadiced-builder-0e3a2a2f0b9bae9e3871a8bf49f885fd0ef7df1b.tar.gz
refactor: change all leftover mentions of `props` to `options`
Diffstat (limited to '')
-rwxr-xr-xiced_builder/src/types/rendered_element.rs36
1 files changed, 15 insertions, 21 deletions
diff --git a/iced_builder/src/types/rendered_element.rs b/iced_builder/src/types/rendered_element.rs
index 3be0d2e..caf6785 100755
--- a/iced_builder/src/types/rendered_element.rs
+++ b/iced_builder/src/types/rendered_element.rs
@@ -187,23 +187,17 @@ impl RenderedElement {
.into()
}
- fn props_codegen(&self) -> String {
- let mut props_string = String::new();
+ pub fn codegen(&self) -> (String, String) {
+ let mut imports = String::new();
+ let mut view = String::new();
+ let mut options = String::new();
for (k, v) in self.options.clone() {
if let Some(v) = v {
- props_string = format!("{props_string}.{k}({v})");
+ options = format!("{options}.{k}({v})");
}
}
- props_string
- }
-
- pub fn codegen(&self) -> (String, String) {
- let mut imports = String::new();
- let mut view = String::new();
- let props = self.props_codegen();
-
let mut elements = String::new();
if let Some(els) = &self.child_elements {
@@ -217,20 +211,20 @@ impl RenderedElement {
match &self.name {
ElementName::Container => {
imports = format!("{imports}container,");
- view = format!("{view}\ncontainer({elements}){props}");
+ view = format!("{view}\ncontainer({elements}){options}");
}
ElementName::Row => {
imports = format!("{imports}row,");
- view = format!("{view}\nrow![{elements}]{props}");
+ view = format!("{view}\nrow![{elements}]{options}");
}
ElementName::Column => {
imports = format!("{imports}column,");
- view = format!("{view}\ncolumn![{elements}]{props}");
+ view = format!("{view}\ncolumn![{elements}]{options}");
}
ElementName::Text(string) => {
imports = format!("{imports}text,");
view = format!(
- "{view}\ntext(\"{}\"){props}",
+ "{view}\ntext(\"{}\"){options}",
if *string == String::new() {
"New Text"
} else {
@@ -241,7 +235,7 @@ impl RenderedElement {
ElementName::Button(string) => {
imports = format!("{imports}button,");
view = format!(
- "{view}\nbutton(\"{}\"){props}",
+ "{view}\nbutton(\"{}\"){options}",
if *string == String::new() {
"New Button"
} else {
@@ -251,11 +245,11 @@ impl RenderedElement {
}
ElementName::Image(path) => {
imports = format!("{imports}image,");
- view = format!("{view}\nimage(\"{path}\"){props}");
+ view = format!("{view}\nimage(\"{path}\"){options}");
}
ElementName::SVG(path) => {
imports = format!("{imports}svg,");
- view = format!("{view}\nsvg(\"{path}\"){props}");
+ view = format!("{view}\nsvg(\"{path}\"){options}");
}
}
@@ -277,14 +271,14 @@ impl RenderedElement {
impl std::fmt::Display for RenderedElement {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- let mut has_props = false;
+ let mut has_options = false;
f.pad("")?;
f.write_fmt(format_args!("{:?}\n", self.name))?;
f.pad("")?;
f.write_str("Options: (")?;
for (k, v) in &self.options {
if let Some(value) = v {
- has_props = true;
+ has_options = true;
f.write_fmt(format_args!(
"\n{:width$.precision$}{}: {}",
"",
@@ -295,7 +289,7 @@ impl std::fmt::Display for RenderedElement {
))?;
}
}
- if has_props {
+ if has_options {
f.write_str("\n")?;
f.pad("")?;
}