ui/gtk/widget.c

changeset 801
e096c441e874
parent 669
5b930e8c3a87
child 962
7016bcb8d38b
--- a/ui/gtk/widget.c	Sun Oct 05 13:30:19 2025 +0200
+++ b/ui/gtk/widget.c	Sun Oct 05 18:13:15 2025 +0200
@@ -32,22 +32,21 @@
 #include "../common/object.h"
 
 UIEXPORT UIWIDGET ui_customwidget_create(UiObject *obj, ui_createwidget_func create_widget, void *userdata, UiWidgetArgs *args) {
-    UiObject* current = uic_current_obj(obj);
-    
     UIWIDGET widget = create_widget(obj, args, userdata);
     
-    UI_APPLY_LAYOUT2(current, args);
-    current->container->add(current->container, widget);
+    UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end;
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ct->add(ct, widget, &layout);
     
     return widget;
 }
 
 UIWIDGET ui_separator_create(UiObject *obj, UiWidgetArgs *args) {
-    UiObject* current = uic_current_obj(obj);
     GtkWidget *widget = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
     ui_set_name_and_style(widget, args->name, args->style_class);
-    UI_APPLY_LAYOUT1(current, (*args));
-    current->container->add(current->container, widget);
+    UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end;
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ct->add(ct, widget, &layout);
     return widget;
 }
 

mercurial