Mercurial > hg > idav / file diff

--- a/ui/qt/button.cpp	Sat Oct 04 14:54:25 2025 +0200
+++ b/ui/qt/button.cpp	Sun Oct 19 21:20:08 2025 +0200
@@ -32,7 +32,6 @@
 
 UIWIDGET ui_button_create(UiObject* obj, UiButtonArgs *args) {
     UiContainerPrivate *ctn = ui_obj_container(obj);
-    UI_APPLY_LAYOUT(ctn->layout, args);
     
     QString str = QString::fromUtf8(args->label);
     QPushButton *button = new QPushButton(str);
@@ -43,7 +42,8 @@
         button->connect(button, SIGNAL(destroyed()), event, SLOT(destroy()));
     }
     
-    ctn->add(button);
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ctn->add(button, layout);
     
     return button;
 }
@@ -69,7 +69,6 @@
 
 UIWIDGET ui_togglebutton_create(UiObject* obj, UiToggleArgs *args) {
     UiContainerPrivate *ctn = ui_obj_container(obj);
-    UI_APPLY_LAYOUT(ctn->layout, args);
     
     QString str = QString::fromUtf8(args->label);
     QPushButton *button = new QPushButton(str);
@@ -98,7 +97,8 @@
         i->set = ui_togglebutton_set;
     }
     
-    ctn->add(button);
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ctn->add(button, layout);
     
     return button;
 }
@@ -129,7 +129,6 @@
 
 UIWIDGET ui_checkbox_create(UiObject* obj, UiToggleArgs *args) {
     UiContainerPrivate *ctn = ui_obj_container(obj);
-    UI_APPLY_LAYOUT(ctn->layout, args);
     
     QString str = QString::fromUtf8(args->label);
     QCheckBox *checkbox = new QCheckBox(str);
@@ -157,7 +156,8 @@
         i->set = ui_checkbox_set;
     }
     
-    ctn->add(checkbox);
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ctn->add(checkbox, layout);
     
     return checkbox;
 }
@@ -188,7 +188,6 @@
 
 UIWIDGET ui_radiobutton_create(UiObject *obj, UiToggleArgs *args) {
     UiContainerPrivate *ctn = ui_obj_container(obj);
-    UI_APPLY_LAYOUT(ctn->layout, args);
     
     QString str = QString::fromUtf8(args->label);
     QRadioButton *button = new QRadioButton(str);
@@ -218,7 +217,8 @@
     button->connect(button, SIGNAL(clicked()), event, SLOT(slot()));
     button->connect(button, SIGNAL(destroyed()), event, SLOT(destroy()));
     
-    ctn->add(button);
+    UiLayout layout = UI_ARGS2LAYOUT(args);
+    ctn->add(button, layout);
     
     return button;
 }