comparison: ui/ui/container.h
ui/ui/container.h
- branch
- newapi
- changeset 193
- 74c688cc1839
- parent 190
- 70fd1b24e395
- child 194
- e2281ace0769
equal
deleted
inserted
replaced
| 192:bcacd00ea955 | 193:74c688cc1839 |
|---|---|
| 46 int spacing; | 46 int spacing; |
| 47 int columnspacing; | 47 int columnspacing; |
| 48 int rowspacing; | 48 int rowspacing; |
| 49 } UiContainerArgs; | 49 } UiContainerArgs; |
| 50 | 50 |
| 51 typedef struct UiFrameArgs { | |
| 52 UiTri fill; | |
| 53 UiBool hexpand; | |
| 54 UiBool vexpand; | |
| 55 int colspan; | |
| 56 int rowspan; | |
| 57 | |
| 58 const char* label; | |
| 59 } UiFrameArgs; | |
| 60 | |
| 51 #define UI_CTN(obj, ctn) for(ctn;ui_container_finish(obj);ui_container_begin_close(obj)) | 61 #define UI_CTN(obj, ctn) for(ctn;ui_container_finish(obj);ui_container_begin_close(obj)) |
| 52 | 62 |
| 53 #define ui_vbox(obj, ...) for(ui_vbox_create(obj, (UiContainerArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) | 63 #define ui_vbox(obj, ...) for(ui_vbox_create(obj, (UiContainerArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) |
| 54 #define ui_hbox(obj, ...) for(ui_hbox_create(obj, (UiContainerArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) | 64 #define ui_hbox(obj, ...) for(ui_hbox_create(obj, (UiContainerArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) |
| 55 #define ui_grid(obj, ...) for(ui_grid_create(obj, (UiContainerArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) | 65 #define ui_grid(obj, ...) for(ui_grid_create(obj, (UiContainerArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) |
| 66 #define ui_frame(obj, ...) for(ui_frame_create(obj, (UiFrameArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) | |
| 56 | 67 |
| 57 | 68 |
| 58 void ui_end(UiObject *obj); | 69 void ui_end(UiObject *obj); |
| 59 | 70 |
| 60 UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs args); | 71 UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs args); |
| 61 UIWIDGET ui_hbox_create(UiObject *obj, UiContainerArgs args); | 72 UIWIDGET ui_hbox_create(UiObject *obj, UiContainerArgs args); |
| 62 | 73 |
| 63 UIWIDGET ui_grid_create(UiObject *obj, UiContainerArgs args); | 74 UIWIDGET ui_grid_create(UiObject *obj, UiContainerArgs args); |
| 75 | |
| 76 UIWIDGET ui_frame_create(UiObject* obj, UiFrameArgs args); | |
| 77 | |
| 78 | |
| 79 | |
| 80 | |
| 64 | 81 |
| 65 UIWIDGET ui_scrolledwindow(UiObject *obj); | 82 UIWIDGET ui_scrolledwindow(UiObject *obj); |
| 66 | 83 |
| 67 UIWIDGET ui_sidebar(UiObject *obj); | 84 UIWIDGET ui_sidebar(UiObject *obj); |
| 68 | 85 |
