diff options
Diffstat (limited to 'src/types')
| -rwxr-xr-x | src/types/rendered_element.rs | 124 |
1 files changed, 62 insertions, 62 deletions
diff --git a/src/types/rendered_element.rs b/src/types/rendered_element.rs index 85767fc..f20c86e 100755 --- a/src/types/rendered_element.rs +++ b/src/types/rendered_element.rs @@ -323,75 +323,75 @@ impl<'a> From<RenderedElement> for Element<'a, Message> { ElementName::Image(p) => { widget::image(p).apply_options(copy.options).into() } - ElementName::Container => if child_elements.len() == 1 { - widget::container(child_elements[0].clone()) - } else { - widget::container(text("New Container")).style( - |theme: &iced::Theme| widget::container::Style { - border: iced::Border { - color: theme.palette().text, - - width: 2.0, - radius: 4.into(), - }, - ..Default::default() + ElementName::Container => { + widget::container(if child_elements.len() == 1 { + Element::from(child_elements[0].clone()) + } else { + Element::from(text("New Container")) + }) + .style(|theme: &iced::Theme| widget::container::Style { + border: iced::Border { + color: theme.palette().primary.scale_alpha(0.6), + + width: 2.0, + radius: 4.into(), }, - ) + background: Some( + theme.palette().primary.scale_alpha(0.25).into(), + ), + ..Default::default() + }) + .padding(20) + .apply_options(copy.options) + .into() } - .padding(20) - .apply_options(copy.options) - .into(), ElementName::Row => { - if !child_elements.is_empty() { - widget::Row::with_children( - child_elements.into_iter().map(Into::into), - ) - .padding(20) - .apply_options(copy.options) - .into() + widget::container(if !child_elements.is_empty() { + widget::row(child_elements.into_iter().map(Into::into)) + .padding(20) + .apply_options(copy.options) } else { - widget::container( - widget::row![text("New Row")] - .padding(20) - .apply_options(copy.options), - ) - .style(|theme: &iced::Theme| widget::container::Style { - border: iced::Border { - color: theme.palette().text, - - width: 2.0, - radius: 4.into(), - }, - ..Default::default() - }) - .into() - } + widget::row![text("New Row")] + .padding(20) + .apply_options(copy.options) + }) + .style(|theme: &iced::Theme| widget::container::Style { + border: iced::Border { + color: theme.palette().danger.scale_alpha(0.6), + + width: 2.0, + radius: 4.into(), + }, + background: Some( + theme.palette().danger.scale_alpha(0.25).into(), + ), + ..Default::default() + }) + .into() } ElementName::Column => { - if !child_elements.is_empty() { - widget::Column::with_children( - child_elements.into_iter().map(Into::into), - ) - .padding(20) - .apply_options(copy.options) - .into() + widget::container(if !child_elements.is_empty() { + widget::column(child_elements.into_iter().map(Into::into)) + .padding(20) + .apply_options(copy.options) } else { - widget::container( - widget::column![text("New Column")] - .padding(20) - .apply_options(copy.options), - ) - .style(|theme: &iced::Theme| widget::container::Style { - border: iced::Border { - color: theme.palette().text, - - width: 2.0, - radius: 4.into(), - }, - ..Default::default() - }) - .into() - } + widget::column![text("New Column")] + .padding(20) + .apply_options(copy.options) + }) + .style(|theme: &iced::Theme| widget::container::Style { + border: iced::Border { + color: theme.palette().success.scale_alpha(0.6), + + width: 2.0, + radius: 4.into(), + }, + background: Some( + theme.palette().success.scale_alpha(0.25).into(), + ), + ..Default::default() + }) + .into() } }; |
