--- a/ui/ui/container.h Sun Oct 01 18:54:23 2023 +0200 +++ b/ui/ui/container.h Sun Oct 01 22:34:48 2023 +0200 @@ -48,11 +48,22 @@ int rowspacing; } UiContainerArgs; +typedef struct UiFrameArgs { + UiTri fill; + UiBool hexpand; + UiBool vexpand; + int colspan; + int rowspan; + + const char* label; +} UiFrameArgs; + #define UI_CTN(obj, ctn) for(ctn;ui_container_finish(obj);ui_container_begin_close(obj)) #define ui_vbox(obj, ...) for(ui_vbox_create(obj, (UiContainerArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) #define ui_hbox(obj, ...) for(ui_hbox_create(obj, (UiContainerArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) #define ui_grid(obj, ...) for(ui_grid_create(obj, (UiContainerArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) +#define ui_frame(obj, ...) for(ui_frame_create(obj, (UiFrameArgs){ __VA_ARGS__ });ui_container_finish(obj);ui_container_begin_close(obj)) void ui_end(UiObject *obj); @@ -62,6 +73,12 @@ UIWIDGET ui_grid_create(UiObject *obj, UiContainerArgs args); +UIWIDGET ui_frame_create(UiObject* obj, UiFrameArgs args); + + + + + UIWIDGET ui_scrolledwindow(UiObject *obj); UIWIDGET ui_sidebar(UiObject *obj);