comparison: ui/winui/window.cpp
ui/winui/window.cpp
- branch
- newapi
- changeset 221
- a82d9beaa94a
- parent 213
- 7e39db525fd9
- child 226
- 4eef1d49f794
equal
deleted
inserted
replaced
| 220:e377456302df | 221:a82d9beaa94a |
|---|---|
| 45 | 45 |
| 46 | 46 |
| 47 using namespace winrt; | 47 using namespace winrt; |
| 48 using namespace Microsoft::UI::Xaml; | 48 using namespace Microsoft::UI::Xaml; |
| 49 using namespace Microsoft::UI::Xaml::Controls; | 49 using namespace Microsoft::UI::Xaml::Controls; |
| 50 using namespace Microsoft::UI::Xaml::Controls::Primitives; | |
| 50 using namespace Microsoft::UI::Xaml::XamlTypeInfo; | 51 using namespace Microsoft::UI::Xaml::XamlTypeInfo; |
| 51 using namespace Microsoft::UI::Xaml::Markup; | 52 using namespace Microsoft::UI::Xaml::Markup; |
| 52 using namespace Windows::UI::Xaml::Interop; | 53 using namespace Windows::UI::Xaml::Interop; |
| 53 using namespace winrt::Windows::Foundation; | 54 using namespace winrt::Windows::Foundation; |
| 54 | 55 |
| 59 UiObject* obj = (UiObject*)cxCalloc(mp->allocator, 1, sizeof(UiObject)); | 60 UiObject* obj = (UiObject*)cxCalloc(mp->allocator, 1, sizeof(UiObject)); |
| 60 | 61 |
| 61 obj->ctx = uic_context(obj, mp); | 62 obj->ctx = uic_context(obj, mp); |
| 62 obj->window = window_data; | 63 obj->window = window_data; |
| 63 | 64 |
| 64 //Window window = Window(); | 65 Window window = Window(); |
| 65 Window window = make<winui::implementation::MainWindow>(); | 66 //Window window = make<winui::implementation::MainWindow>(); |
| 67 | |
| 68 winrt::Windows::Foundation::Uri resourceLocator{ L"ms-appx:///MainWindow.xaml" }; | |
| 69 Application::LoadComponent(window, resourceLocator, ComponentResourceLocation::Nested); | |
| 70 | |
| 66 window.ExtendsContentIntoTitleBar(true); | 71 window.ExtendsContentIntoTitleBar(true); |
| 67 | 72 |
| 68 Grid grid = Grid(); | 73 Grid grid = Grid(); |
| 69 window.Content(grid); | 74 window.Content(grid); |
| 70 | 75 |
