Mercurial > hg > toolkit / file diff

--- a/ui/winui/window.cpp	Mon May 29 10:37:23 2023 +0200
+++ b/ui/winui/window.cpp	Mon May 29 12:48:42 2023 +0200
@@ -38,6 +38,7 @@
 #include <winrt/Microsoft.UI.Xaml.Markup.h>
 
 #include "appmenu.h"
+#include "container.h"
 
 #include "../common/context.h"
 
@@ -66,13 +67,27 @@
 	Grid grid = Grid();
 	obj->wobj.Content(grid);
 
+	obj->container = new UiBoxContainer(grid, UI_CONTAINER_VBOX);
+
 	if (uic_get_menu_list()) {
+		// create/add menubar
 		MenuBar mb = ui_create_menubar(obj);
 		mb.VerticalAlignment(VerticalAlignment::Top);
-		grid.Children().Append(mb);
+		obj->container->Add(mb, false);
 	}
 
+	Button b1 = Button();
+	Button b2 = Button();
+
+	b1.Content(box_value(L"Button 1"));
+	b2.Content(box_value(L"Button 2"));
+
+	obj->container->Add(b1, false);
+	obj->container->Add(b2, false);
+
+
 	obj->window = window_data;
+	
 
 	return obj;
 }