comparison: ui/qt/window.cpp
ui/qt/window.cpp
- changeset 56
- 87e3a5dc66dd
- parent 55
- 9076eb40454d
- child 66
- 8d490d97aab8
equal
deleted
inserted
replaced
| 55:9076eb40454d | 56:87e3a5dc66dd |
|---|---|
| 30 #include "../common/context.h" | 30 #include "../common/context.h" |
| 31 | 31 |
| 32 #include "window.h" | 32 #include "window.h" |
| 33 #include "menu.h" | 33 #include "menu.h" |
| 34 #include "toolbar.h" | 34 #include "toolbar.h" |
| 35 #include "container.h" | |
| 35 | 36 |
| 36 UiObject* ui_window(char *title, void *window_data) { | 37 UiObject* ui_window(char *title, void *window_data) { |
| 37 UcxMempool *mp = ucx_mempool_new(256); | 38 UcxMempool *mp = ucx_mempool_new(256); |
| 38 UiObject *obj = (UiObject*)ucx_mempool_calloc(mp, 1, sizeof(UiObject)); | 39 UiObject *obj = (UiObject*)ucx_mempool_calloc(mp, 1, sizeof(UiObject)); |
| 39 obj->ctx = uic_context(obj, mp); | 40 obj->ctx = uic_context(obj, mp); |
| 46 ui_add_menus(obj, window); | 47 ui_add_menus(obj, window); |
| 47 | 48 |
| 48 QToolBar *toolbar = ui_create_toolbar(obj); | 49 QToolBar *toolbar = ui_create_toolbar(obj); |
| 49 window->addToolBar(Qt::TopToolBarArea, toolbar); | 50 window->addToolBar(Qt::TopToolBarArea, toolbar); |
| 50 | 51 |
| 52 obj->container = new UiWindowContainer(window); | |
| 53 | |
| 51 obj->widget = window; | 54 obj->widget = window; |
| 52 return obj; | 55 return obj; |
| 53 } | 56 } |
