diff options
| author | Yuqian Yang <crupest@outlook.com> | 2018-09-23 16:48:18 +0000 |
|---|---|---|
| committer | Yuqian Yang <crupest@outlook.com> | 2018-09-23 16:48:18 +0000 |
| commit | 001e1d955132a02a2f7effc841ab9e5ee425eda1 (patch) | |
| tree | 1bfbdcc2a25316d6e85cc9b4527a1ec15841b502 /CruUI/main.cpp | |
| parent | 796ba6e1e816ec87a106f2f7b501e38c99f059e1 (diff) | |
| parent | 9049f7674e0808cc3676543e0a95330a1657d10e (diff) | |
| download | cru-001e1d955132a02a2f7effc841ab9e5ee425eda1.tar.gz cru-001e1d955132a02a2f7effc841ab9e5ee425eda1.tar.bz2 cru-001e1d955132a02a2f7effc841ab9e5ee425eda1.zip | |
Merge branch 'textboxdev' into 'master'
TextBox develop.
See merge request crupest/CruUI!2
Diffstat (limited to 'CruUI/main.cpp')
| -rw-r--r-- | CruUI/main.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CruUI/main.cpp b/CruUI/main.cpp index 56d42894..67b35406 100644 --- a/CruUI/main.cpp +++ b/CruUI/main.cpp @@ -6,6 +6,7 @@ #include "ui/controls/button.h" #include "ui/controls/margin_container.h" #include "ui/events/ui_event.h" +#include "ui/controls/text_box.h" using cru::String; @@ -20,6 +21,7 @@ using cru::ui::controls::TextBlock; using cru::ui::controls::ToggleButton; using cru::ui::controls::Button; using cru::ui::controls::MarginContainer; +using cru::ui::controls::TextBox; int APIENTRY wWinMain( HINSTANCE hInstance, @@ -29,7 +31,7 @@ int APIENTRY wWinMain( Application application(hInstance); Window window; - + /* window.native_message_event.AddHandler([](cru::ui::events::WindowNativeMessageEventArgs& args) { if (args.GetWindowMessage().msg == WM_PAINT) @@ -38,7 +40,7 @@ int APIENTRY wWinMain( //args.SetResult(0); } }); - + */ /* // test1 cru::ui::controls::TextBlock text_block; @@ -84,6 +86,7 @@ int APIENTRY wWinMain( }); */ + /* //test 2 const auto layout = CreateWithLayout<LinearLayout>(LayoutSideParams::Exactly(500), LayoutSideParams::Content()); @@ -137,6 +140,9 @@ int APIENTRY wWinMain( window.AddChild(layout); + */ + + window.AddChild(CreateWithLayout<TextBox>(LayoutSideParams::Stretch(), LayoutSideParams::Stretch())); window.Show(); |