--- a/ui/cocoa/container.h Tue Oct 07 14:59:11 2025 +0200 +++ b/ui/cocoa/container.h Tue Oct 07 15:42:18 2025 +0200 @@ -42,24 +42,6 @@ UI_LAYOUT_FALSE, }; -struct UiLayout { - UiBool fill; - //UiBool newline; - //char *label; - UiBool hexpand; - UiBool vexpand; - UiBool hfill; - UiBool vfill; - //int width; - int margin; - int margin_left; - int margin_right; - int margin_top; - int margin_bottom; - int colspan; - int rowspan; -}; - #define UI_INIT_LAYOUT(args) (UiLayout) {\ .fill = args->fill, \ .hexpand = args->hexpand, \ @@ -78,8 +60,7 @@ @protocol Container @property UiLayout uilayout; -@property const char *label; -@property UiBool newline; +@property UiContainerX *container; - (void) addView:(NSView*)view margin:(NSEdgeInsets)margin;