1 files changed, 91 insertions, 67 deletions

diff --git a/src/types/rendered_element.rs b/src/types/rendered_element.rs
index 0a78dcd..020aa46 100755
--- a/src/types/rendered_element.rs
+++ b/src/types/rendered_element.rs
@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 
 use iced::advanced::widget::Id;
-use iced::{Element, Length, widget};
+use iced::{Element, widget};
 use serde::{Deserialize, Serialize};
 
 use crate::Error;
@@ -171,34 +171,6 @@ impl RenderedElement {
         self
     }
 
-    pub fn text_view<'a>(self) -> Element<'a, Message> {
-        let mut children = widget::column![];
-
-        if let Some(els) = self.child_elements.clone() {
-            for el in els {
-                children = children.push(el.clone().text_view());
-            }
-        }
-        iced_drop::droppable(
-            widget::container(
-                widget::column![
-                    widget::text(self.name.clone().to_string()),
-                    children
-                ]
-                .width(Length::Fill)
-                .spacing(10),
-            )
-            .padding(10)
-            .style(widget::container::bordered_box),
-        )
-        .id(self.id().clone())
-        .drag_hide(true)
-        .on_drop(move |point, rect| {
-            Message::MoveElement(self.clone(), point, rect)
-        })
-        .into()
-    }
-
     pub fn codegen(&self) -> (String, String) {
         let mut imports = String::new();
         let mut view = String::new();
@@ -223,7 +195,14 @@ impl RenderedElement {
         match &self.name {
             ElementName::Container => {
                 imports = format!("{imports}container,");
-                view = format!("{view}\ncontainer({elements}){options}");
+                view = format!(
+                    "{view}\ncontainer({}){options}",
+                    if elements.is_empty() {
+                        String::from("\"\"")
+                    } else {
+                        elements.to_string()
+                    }
+                );
             }
             ElementName::Row => {
                 imports = format!("{imports}row,");
@@ -237,7 +216,7 @@ impl RenderedElement {
                 imports = format!("{imports}text,");
                 view = format!(
                     "{view}\ntext(\"{}\"){options}",
-                    if *string == String::new() {
+                    if string.is_empty() {
                         "New Text"
                     } else {
                         string
@@ -248,7 +227,7 @@ impl RenderedElement {
                 imports = format!("{imports}button,");
                 view = format!(
                     "{view}\nbutton(\"{}\"){options}",
-                    if *string == String::new() {
+                    if string.is_empty() {
                         "New Button"
                     } else {
                         string
@@ -317,53 +296,98 @@ impl<'a> From<RenderedElement> for Element<'a, Message> {
         let child_elements = copy.child_elements.unwrap_or_default();
 
         let content: Element<'a, Message> = match copy.name {
-            ElementName::Text(s) => {
-                if s.is_empty() {
-                    widget::text("New Text").apply_options(copy.options).into()
-                } else {
-                    widget::text(s).apply_options(copy.options).into()
-                }
-            }
-            ElementName::Button(s) => {
-                if s.is_empty() {
-                    widget::button(widget::text("New Button"))
-                        .apply_options(copy.options)
-                        .into()
-                } else {
-                    widget::button(widget::text(s))
-                        .apply_options(copy.options)
-                        .into()
-                }
+            ElementName::Text(s) => if s.is_empty() {
+                widget::text("New Text")
+            } else {
+                widget::text(s)
             }
+            .apply_options(copy.options)
+            .into(),
+            ElementName::Button(s) => widget::button(if s.is_empty() {
+                widget::text("New Button")
+            } else {
+                widget::text(s)
+            })
+            .apply_options(copy.options)
+            .into(),
             ElementName::Svg(p) => {
                 widget::svg(p).apply_options(copy.options).into()
             }
             ElementName::Image(p) => {
                 widget::image(p).apply_options(copy.options).into()
             }
-            ElementName::Container => {
-                widget::container(if child_elements.len() == 1 {
-                    child_elements[0].clone().into()
-                } else {
-                    Element::from("")
-                })
-                .apply_options(copy.options)
-                .padding(20)
-                .into()
+            ElementName::Container => if child_elements.len() == 1 {
+                widget::container(child_elements[0].clone())
+            } else {
+                widget::container("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::Row => widget::Row::from_vec(
-                child_elements.into_iter().map(Into::into).collect(),
-            )
-            .padding(20)
-            .apply_options(copy.options)
-            .into(),
-            ElementName::Column => widget::Column::from_vec(
-                child_elements.into_iter().map(Into::into).collect(),
-            )
             .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()
+                } else {
+                    widget::container(
+                        widget::row!["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()
+                }
+            }
+            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()
+                } else {
+                    widget::container(
+                        widget::column!["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()
+                }
+            }
         };
+
         iced_drop::droppable(content)
             .id(value.id().clone())
             .drag_hide(true)