Merge branch '9-border' into 'master'

Resolve "Abstract out border control of button and border."

Closes #9

See merge request crupest/CruUI!11

1 files changed, 15 insertions, 0 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 4f711208..7a105d79 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -143,12 +143,27 @@ int APIENTRY wWinMain(
     window.AddChild(layout);
     */
 
+    /*
     window.AddChild(
         CreateWithLayout<Border>(LayoutSideParams::Exactly(200), LayoutSideParams::Content(),
             std::initializer_list<cru::ui::Control*>{
                 CreateWithLayout<TextBox>(LayoutSideParams::Stretch(), LayoutSideParams::Content())
             }
     ));
+    */
+
+    window.AddChild(
+        Border::Create({
+            MarginContainer::Create(Thickness(50, 50), {
+                LinearLayout::Create(LinearLayout::Orientation::Vertical, {
+                    Button::Create({
+                        TextBlock::Create(L"Button")
+                    }),
+                    TextBox::Create()
+                })
+            })
+        })
+    );
 
     window.Show();