comparison: ui/winui/window.cpp
ui/winui/window.cpp
- branch
- newapi
- changeset 182
- 6cf690e042bd
- parent 181
- c52d88ea020b
- child 183
- 3ce2eb11913b
equal
deleted
inserted
replaced
| 181:c52d88ea020b | 182:6cf690e042bd |
|---|---|
| 36 #include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h> | 36 #include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h> |
| 37 #include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h> | 37 #include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h> |
| 38 #include <winrt/Microsoft.UI.Xaml.Markup.h> | 38 #include <winrt/Microsoft.UI.Xaml.Markup.h> |
| 39 | 39 |
| 40 #include "appmenu.h" | 40 #include "appmenu.h" |
| 41 #include "container.h" | |
| 41 | 42 |
| 42 #include "../common/context.h" | 43 #include "../common/context.h" |
| 43 | 44 |
| 44 #include <stdlib.h> | 45 #include <stdlib.h> |
| 45 | 46 |
| 64 | 65 |
| 65 obj->wobj = Window(); | 66 obj->wobj = Window(); |
| 66 Grid grid = Grid(); | 67 Grid grid = Grid(); |
| 67 obj->wobj.Content(grid); | 68 obj->wobj.Content(grid); |
| 68 | 69 |
| 70 obj->container = new UiBoxContainer(grid, UI_CONTAINER_VBOX); | |
| 71 | |
| 69 if (uic_get_menu_list()) { | 72 if (uic_get_menu_list()) { |
| 73 // create/add menubar | |
| 70 MenuBar mb = ui_create_menubar(obj); | 74 MenuBar mb = ui_create_menubar(obj); |
| 71 mb.VerticalAlignment(VerticalAlignment::Top); | 75 mb.VerticalAlignment(VerticalAlignment::Top); |
| 72 grid.Children().Append(mb); | 76 obj->container->Add(mb, false); |
| 73 } | 77 } |
| 74 | 78 |
| 79 Button b1 = Button(); | |
| 80 Button b2 = Button(); | |
| 81 | |
| 82 b1.Content(box_value(L"Button 1")); | |
| 83 b2.Content(box_value(L"Button 2")); | |
| 84 | |
| 85 obj->container->Add(b1, false); | |
| 86 obj->container->Add(b2, false); | |
| 87 | |
| 88 | |
| 75 obj->window = window_data; | 89 obj->window = window_data; |
| 90 | |
| 76 | 91 |
| 77 return obj; | 92 return obj; |
| 78 } | 93 } |
