Mercurial > hg > idav / file diff

--- a/ui/gtk/entry.c	Sat Oct 04 14:54:25 2025 +0200
+++ b/ui/gtk/entry.c	Sun Oct 19 21:20:08 2025 +0200
@@ -39,8 +39,6 @@
     double min = args->min;
     double max = args->max != 0 ? args->max : 1000;
     
-    UiObject* current = uic_current_obj(obj);
-    
     UiVar *var = NULL;
     UiVarType vartype = 0;
     if(args->varname) {
@@ -48,20 +46,20 @@
         if(var) {
             vartype = var->type;
         } else {
-            var = uic_widget_var(obj->ctx, current->ctx, args->rangevalue, args->varname, UI_VAR_RANGE);
+            var = uic_widget_var(obj->ctx, obj->ctx, args->rangevalue, args->varname, UI_VAR_RANGE);
             vartype = UI_VAR_RANGE;
         }
     }
     
     if(!var) {
         if(args->intvalue) {
-            var = uic_widget_var(obj->ctx, current->ctx, args->intvalue, NULL, UI_VAR_INTEGER);
+            var = uic_widget_var(obj->ctx, obj->ctx, args->intvalue, NULL, UI_VAR_INTEGER);
             vartype = UI_VAR_INTEGER;
         } else if(args->doublevalue) {
-            var = uic_widget_var(obj->ctx, current->ctx, args->doublevalue, NULL, UI_VAR_DOUBLE);
+            var = uic_widget_var(obj->ctx, obj->ctx, args->doublevalue, NULL, UI_VAR_DOUBLE);
             vartype = UI_VAR_DOUBLE;
         } else if(args->rangevalue) {
-            var = uic_widget_var(obj->ctx, current->ctx, args->rangevalue, NULL, UI_VAR_RANGE);
+            var = uic_widget_var(obj->ctx, obj->ctx, args->rangevalue, NULL, UI_VAR_RANGE);
             vartype = UI_VAR_RANGE;
         }
     }
@@ -144,8 +142,9 @@
             G_CALLBACK(ui_destroy_vardata),
             event);
     
-    UI_APPLY_LAYOUT2(current, args);
-    current->container->add(current->container, spin);
+    UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end;
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ct->add(ct, spin, &layout);
     
     return spin;
 }