comparison: ui/winui/toolkit.cpp
ui/winui/toolkit.cpp
- branch
- newapi
- changeset 183
- 3ce2eb11913b
- parent 181
- c52d88ea020b
- child 184
- 8c9b4b28aaa9
equal
deleted
inserted
replaced
| 182:6cf690e042bd | 183:3ce2eb11913b |
|---|---|
| 85 } | 85 } |
| 86 private: | 86 private: |
| 87 XamlControlsXamlMetaDataProvider provider; | 87 XamlControlsXamlMetaDataProvider provider; |
| 88 }; | 88 }; |
| 89 | 89 |
| 90 UiWindow::UiWindow(winrt::Microsoft::UI::Xaml::Window& win) : window(win) {}; | |
| 91 | |
| 92 UiWidget::UiWidget(winrt::Microsoft::UI::Xaml::UIElement& elm) : uielement(elm) {} | |
| 93 | |
| 94 | |
| 90 | 95 |
| 91 | 96 |
| 92 void ui_init(const char* appname, int argc, char** argv) { | 97 void ui_init(const char* appname, int argc, char** argv) { |
| 93 application_name = appname; | 98 application_name = appname; |
| 94 } | 99 } |
| 115 void ui_main() { | 120 void ui_main() { |
| 116 init_apartment(); | 121 init_apartment(); |
| 117 Application::Start([](auto&&) {make<App>(); }); | 122 Application::Start([](auto&&) {make<App>(); }); |
| 118 } | 123 } |
| 119 | 124 |
| 125 class UiWin { | |
| 126 public: | |
| 127 Window window; | |
| 128 }; | |
| 129 | |
| 120 void ui_show(UiObject* obj) { | 130 void ui_show(UiObject* obj) { |
| 121 if (obj->wobj) { | 131 if (obj->wobj) { |
| 122 obj->wobj.Activate(); | 132 obj->wobj->window.Activate(); |
| 123 } else { | 133 } else { |
| 124 // ZODO | 134 // TODO |
| 125 } | 135 } |
| 126 } | 136 } |
| 127 | 137 |
| 128 void ui_close(UiObject* obj) { | 138 void ui_close(UiObject* obj) { |
| 129 | 139 |
