Mercurial > hg > idav / file diff

--- a/ui/gtk/image.c	Sat Oct 04 14:54:25 2025 +0200
+++ b/ui/gtk/image.c	Sun Oct 19 21:20:08 2025 +0200
@@ -64,8 +64,6 @@
 #endif
 
 UIWIDGET ui_imageviewer_create(UiObject *obj, UiImageViewerArgs *args) {
-    UiObject *current = uic_current_obj(obj);
-    
     GtkWidget *drawingarea = gtk_drawing_area_new();
     GtkWidget *toplevel;
     GtkWidget *widget = drawingarea;
@@ -111,7 +109,7 @@
     
     g_object_set_data_full(G_OBJECT(drawingarea), "uiimageviewer", imgviewer, (GDestroyNotify)imageviewer_destroy);
     
-    UiVar *var = uic_widget_var(obj->ctx, current->ctx, args->value, args->varname, UI_VAR_GENERIC);
+    UiVar *var = uic_widget_var(obj->ctx, obj->ctx, args->value, args->varname, UI_VAR_GENERIC);
     imgviewer->var = var;
     imgviewer->widget = drawingarea;
     
@@ -187,8 +185,9 @@
         ui_widget_set_contextmenu(widget, menu);
     }
        
-    UI_APPLY_LAYOUT2(current, args);
-    current->container->add(current->container, toplevel);
+    UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end;
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ct->add(ct, toplevel, &layout);
     
     return toplevel;
 }