diff options
| author | Yuqian Yang <crupest@outlook.com> | 2018-09-27 15:01:15 +0000 |
|---|---|---|
| committer | Yuqian Yang <crupest@outlook.com> | 2018-09-27 15:01:15 +0000 |
| commit | b0b5a481c9b0460f275887b15e8edecc34e99186 (patch) | |
| tree | 914b66de1428ddfa55a190495e7e24cbb5f8b8c2 /src/main.cpp | |
| parent | 1fdc86fe5f8d18fdc8927f663aaeaa0b6b8f1e9b (diff) | |
| parent | eab8d69ccac6f7b306561a49e9c1f8fda21376d2 (diff) | |
| download | cru-b0b5a481c9b0460f275887b15e8edecc34e99186.tar.gz cru-b0b5a481c9b0460f275887b15e8edecc34e99186.tar.bz2 cru-b0b5a481c9b0460f275887b15e8edecc34e99186.zip | |
Merge branch '5-border' into 'master'
Resolve "Develop border."
Closes #5
See merge request crupest/CruUI!7
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 67b35406..4f711208 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,13 +1,13 @@ #include "application.h" #include "ui/window.h" +#include "ui/events/ui_event.h" #include "ui/controls/linear_layout.h" #include "ui/controls/text_block.h" #include "ui/controls/toggle_button.h" #include "ui/controls/button.h" #include "ui/controls/margin_container.h" -#include "ui/events/ui_event.h" #include "ui/controls/text_box.h" - +#include "ui/controls/border.h" using cru::String; using cru::Application; @@ -22,6 +22,7 @@ using cru::ui::controls::ToggleButton; using cru::ui::controls::Button; using cru::ui::controls::MarginContainer; using cru::ui::controls::TextBox; +using cru::ui::controls::Border; int APIENTRY wWinMain( HINSTANCE hInstance, @@ -142,7 +143,12 @@ int APIENTRY wWinMain( window.AddChild(layout); */ - window.AddChild(CreateWithLayout<TextBox>(LayoutSideParams::Stretch(), LayoutSideParams::Stretch())); + window.AddChild( + CreateWithLayout<Border>(LayoutSideParams::Exactly(200), LayoutSideParams::Content(), + std::initializer_list<cru::ui::Control*>{ + CreateWithLayout<TextBox>(LayoutSideParams::Stretch(), LayoutSideParams::Content()) + } + )); window.Show(); |