Mercurial > hg > idav / file diff

--- a/ui/gtk/display.c	Sat Oct 04 14:54:25 2025 +0200
+++ b/ui/gtk/display.c	Sun Oct 19 21:20:08 2025 +0200
@@ -47,8 +47,6 @@
 }
 
 UIWIDGET ui_label_create(UiObject *obj, UiLabelArgs *args) {
-    UiObject* current = uic_current_obj(obj);
-    
     const char *css_class = NULL;
     char *markup = NULL;
     if(args->label) {
@@ -105,7 +103,7 @@
     }
     
 
-    UiVar* var = uic_widget_var(obj->ctx, current->ctx, args->value, args->varname, UI_VAR_STRING);
+    UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_STRING);
     if(var) {
         UiString* value = (UiString*)var->value;
         value->obj = widget;
@@ -113,8 +111,9 @@
         value->set = ui_label_set;
     }
     
-    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;
 }
@@ -147,10 +146,12 @@
     }
 }
 
+/*
 UIWIDGET ui_space_deprecated(UiObject *obj) {
     GtkWidget *widget = gtk_label_new("");
-    UiContainer *ct = uic_get_current_container(obj);
-    ct->add(ct, widget);
+    UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end;
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ct->add(ct, widget, &layout);
     
     return widget;
 }
@@ -161,12 +162,14 @@
 #else
     GtkWidget *widget = gtk_hseparator_new();
 #endif
-    UiContainer *ct = uic_get_current_container(obj);
-    ct->add(ct, widget);
+    UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end;
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ct->add(ct, widget, &layout);
     
     return widget;
 }
-
+*/
+ 
 /* ------------------------- progress bar ------------------------- */
 
 typedef struct UiProgressBarRange {
@@ -175,8 +178,6 @@
 } UiProgressBarRange;
 
 UIWIDGET ui_progressbar_create(UiObject *obj, UiProgressbarArgs *args) {
-    UiObject* current = uic_current_obj(obj);
-    
     GtkWidget *progressbar = gtk_progress_bar_new();
     if(args->max > args->min) {
         UiProgressBarRange *range = malloc(sizeof(UiProgressBarRange));
@@ -191,7 +192,7 @@
     }
     
     
-    UiVar* var = uic_widget_var(obj->ctx, current->ctx, args->value, args->varname, UI_VAR_DOUBLE);
+    UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_DOUBLE);
     if(var && var->value) {
         UiDouble *value = var->value;
         value->get = ui_progressbar_get;
@@ -200,8 +201,9 @@
         ui_progressbar_set(value, value->value);
     }
     
-    UI_APPLY_LAYOUT2(current, args);
-    current->container->add(current->container, progressbar);
+    UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end;
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ct->add(ct, progressbar, &layout);
     
     return progressbar;
 }
@@ -229,11 +231,9 @@
 /* ------------------------- progress spinner ------------------------- */
 
 UIWIDGET ui_progressspinner_create(UiObject* obj, UiProgressbarSpinnerArgs *args) {
-    UiObject* current = uic_current_obj(obj);
-    
     GtkWidget *spinner = gtk_spinner_new();
     
-    UiVar* var = uic_widget_var(obj->ctx, current->ctx, args->value, args->varname, UI_VAR_INTEGER);
+    UiVar* var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_INTEGER);
     if(var && var->value) {
         UiInteger *value = var->value;
         value->get = ui_spinner_get;
@@ -242,8 +242,9 @@
         ui_spinner_set(value, value->value);
     }
     
-    UI_APPLY_LAYOUT2(current, args);
-    current->container->add(current->container, spinner);
+    UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end;
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ct->add(ct, spinner, &layout);
     
     return spinner;
 }