From 1e6963304f1efdbc15b880a650346c631d15e99b Mon Sep 17 00:00:00 2001 From: pml68 Date: Tue, 1 Jul 2025 22:54:31 +0200 Subject: fix: relative project path written to config, bump MSRV to 1.88.0 --- src/types/rendered_element.rs | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'src/types/rendered_element.rs') diff --git a/src/types/rendered_element.rs b/src/types/rendered_element.rs index b7fd839..be2a004 100755 --- a/src/types/rendered_element.rs +++ b/src/types/rendered_element.rs @@ -95,12 +95,11 @@ impl RenderedElement { let Some(parent) = self.find_parent(element) else { return; }; - if let Some(child_elements) = parent.child_elements.as_mut() { - if let Some(index) = + if let Some(child_elements) = parent.child_elements.as_mut() + && let Some(index) = child_elements.iter().position(|x| x == element) - { - let _ = child_elements.remove(index); - } + { + let _ = child_elements.remove(index); } } @@ -525,25 +524,22 @@ pub fn container(content: Option) -> RenderedElement { ]) } -pub fn row(child_elements: Option>) -> RenderedElement { - RenderedElement::with(ElementName::Row, child_elements.unwrap_or_default()) - .preset_options(&[ - "spacing", "padding", "width", "height", "align_y", "clip", - ]) +pub fn row(child_elements: Vec) -> RenderedElement { + RenderedElement::with(ElementName::Row, child_elements).preset_options(&[ + "spacing", "padding", "width", "height", "align_y", "clip", + ]) } -pub fn column(child_elements: Option>) -> RenderedElement { - RenderedElement::with( - ElementName::Column, - child_elements.unwrap_or_default(), +pub fn column(child_elements: Vec) -> RenderedElement { + RenderedElement::with(ElementName::Column, child_elements).preset_options( + &[ + "spacing", + "padding", + "width", + "height", + "max_width", + "align_x", + "clip", + ], ) - .preset_options(&[ - "spacing", - "padding", - "width", - "height", - "max_width", - "align_x", - "clip", - ]) } -- cgit v1.2.3