Mercurial > hg > toolkit / file diff

--- a/ui/winui/container.cpp	Sun Sep 24 12:03:57 2023 +0200
+++ b/ui/winui/container.cpp	Sun Oct 01 09:23:47 2023 +0200
@@ -189,8 +189,11 @@
 	control.HorizontalAlignment(HorizontalAlignment::Stretch);
 	control.VerticalAlignment(VerticalAlignment::Stretch);
 
-	if (layout.gridwidth > 0) {
-		grid.SetColumnSpan(control, layout.gridwidth);
+	if (layout.colspan > 0) {
+		grid.SetColumnSpan(control, layout.colspan);
+	}
+	if (layout.rowspan > 0) {
+		grid.SetRowSpan(control, layout.rowspan);
 	}
 
 	grid.SetRow(control, y);
@@ -229,9 +232,19 @@
 	ct->layout.width = width;
 }
 
-void ui_layout_gridwidth(UiObject* obj, int width) {
+void ui_layout_height(UiObject* obj, int height) {
+	UiContainer* ct = uic_get_current_container(obj);
+	ct->layout.height = height;
+}
+
+void ui_layout_colspan(UiObject* obj, int cols) {
 	UiContainer* ct = uic_get_current_container(obj);
-	ct->layout.gridwidth = width;
+	ct->layout.colspan = cols;
+}
+
+void ui_layout_rowspan(UiObject* obj, int rows) {
+	UiContainer* ct = uic_get_current_container(obj);
+	ct->layout.rowspan = rows;
 }
 
 void ui_newline(UiObject* obj) {