Mercurial > hg > toolkit / changeset

--- a/ui/cocoa/GridLayout.m	Sun Aug 24 11:14:31 2025 +0200
+++ b/ui/cocoa/GridLayout.m	Sun Aug 24 12:37:33 2025 +0200
@@ -293,7 +293,7 @@
     return self.preferredSize;
 }
 
-- (void) addView:(NSView*)view fill:(BOOL)fill {
+- (void) addView:(NSView*)view {
     if(_newline) {
         _y++;
         _x = 0;

--- a/ui/cocoa/button.m	Sun Aug 24 11:14:31 2025 +0200
+++ b/ui/cocoa/button.m	Sun Aug 24 12:37:33 2025 +0200
@@ -47,7 +47,7 @@
     }
     
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, button, &layout, FALSE);
+    ui_container_add(obj, button, &layout);
     
     return (__bridge void*)button;
 }
@@ -89,7 +89,7 @@
     }
     
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, button, &layout, FALSE);
+    ui_container_add(obj, button, &layout);
     
     return (__bridge void*)button;
 }
@@ -150,7 +150,7 @@
     }
     
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, button, &layout, FALSE);
+    ui_container_add(obj, button, &layout);
     
     return (__bridge void*)button;
 }
@@ -242,7 +242,7 @@
     }
     
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, button, &layout, FALSE);
+    ui_container_add(obj, button, &layout);
     
     return (__bridge void*)button;
 }

--- a/ui/cocoa/container.h	Sun Aug 24 11:14:31 2025 +0200
+++ b/ui/cocoa/container.h	Sun Aug 24 12:37:33 2025 +0200
@@ -71,7 +71,7 @@
 @property const char *label;
 @property UiBool newline;
 
-- (void) addView:(NSView*)view fill:(BOOL)fill;
+- (void) addView:(NSView*)view;
 
 @end
 
@@ -87,4 +87,4 @@
 
 UiContainerX* ui_create_container(UiObject *obj, id<Container> container);
 
-void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout, UiBool fill);
+void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout);

--- a/ui/cocoa/container.m	Sun Aug 24 11:14:31 2025 +0200
+++ b/ui/cocoa/container.m	Sun Aug 24 12:37:33 2025 +0200
@@ -57,10 +57,8 @@
     return self;
 }
 
-- (void) addView:(NSView*)view fill:(BOOL)fill {
-    if(_uilayout.fill != UI_LAYOUT_UNDEFINED) {
-        fill = ui_lb2bool(_uilayout.fill);
-    }
+- (void) addView:(NSView*)view {
+    UiBool fill = _uilayout.fill;
     
     [self addArrangedSubview:view];
     
@@ -101,7 +99,7 @@
     
     // add box to the parent
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, box, &layout, TRUE);
+    ui_container_add(obj, box, &layout);
     
     // add new box to the obj container chain
     uic_object_push_container(obj, ui_create_container(obj, box));
@@ -123,7 +121,7 @@
     
     // add box to the parent
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, grid, &layout, TRUE);
+    ui_container_add(obj, grid, &layout);
     
     // add new box to the obj container chain
     uic_object_push_container(obj, ui_create_container(obj, grid));
@@ -157,11 +155,11 @@
     return ctn;
 }
 
-void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout, UiBool fill) {
+void ui_container_add(UiObject *obj, NSView *view, UiLayout *layout) {
     UiContainerX *ctn = obj->container_end;
     id<Container> container = (__bridge id<Container>)ctn->container;
     container.uilayout = *layout;
-    [container addView:view fill:fill];
+    [container addView:view];
 }
 
 /* ---------------------- public layout functions ----------------------- */

--- a/ui/cocoa/list.m	Sun Aug 24 11:14:31 2025 +0200
+++ b/ui/cocoa/list.m	Sun Aug 24 12:37:33 2025 +0200
@@ -78,7 +78,7 @@
     scrollview.documentView = tableview;
     
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, scrollview, &layout, TRUE);
+    ui_container_add(obj, scrollview, &layout);
     
     add_listdelegate(obj, tableview, args);
     
@@ -126,7 +126,7 @@
     }
     
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, scrollview, &layout, TRUE);
+    ui_container_add(obj, scrollview, &layout);
     
     add_listdelegate(obj, tableview, args);
     
@@ -282,7 +282,7 @@
     uidropdown.getvaluedata = args->getvalue2data;
     
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, dropdown, &layout, FALSE);
+    ui_container_add(obj, dropdown, &layout);
     
     UiVar *var = uic_widget_var(obj->ctx, obj->ctx, args->list, args->varname, UI_VAR_LIST);
     if(var) {

--- a/ui/cocoa/text.m	Sun Aug 24 11:14:31 2025 +0200
+++ b/ui/cocoa/text.m	Sun Aug 24 12:37:33 2025 +0200
@@ -42,7 +42,7 @@
     scrollview.documentView = textview;
     
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, scrollview, &layout, TRUE);
+    ui_container_add(obj, scrollview, &layout);
     
     
     UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_TEXT);
@@ -189,7 +189,7 @@
     }
     
     UiLayout layout = UI_INIT_LAYOUT(args);
-    ui_container_add(obj, textfield, &layout, FALSE);
+    ui_container_add(obj, textfield, &layout);
     
     UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_STRING);
     if(var) {