Mercurial > hg > toolkit / file diff

--- a/ui/winui/window.cpp	Tue May 23 11:42:39 2023 +0200
+++ b/ui/winui/window.cpp	Tue May 23 14:19:06 2023 +0200
@@ -37,6 +37,8 @@
 #include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
 #include <winrt/Microsoft.UI.Xaml.Markup.h>
 
+#include "appmenu.h"
+
 #include <stdlib.h>
 
 using namespace winrt;
@@ -49,8 +51,17 @@
 
 class UiWindow : UiWidget {
 public:
-	UiWindow(const char* title) {
+	UiWindow(const char* title, UiObject *obj) {
 		window = Window();
+
+		grid = Grid();
+		window.Content(grid);
+
+		if (uic_get_menu_list()) {
+			MenuBar mb = ui_create_menubar(obj);
+			mb.VerticalAlignment(VerticalAlignment::Top);
+			grid.Children().Append(mb);
+		}
 	}
 
 	virtual void show() {
@@ -58,12 +69,13 @@
 	}
 
 	Window window{ nullptr };
+	Grid grid;
 };
 
 UiObject* ui_window(const char* title, void* window_data) {
 	UiObject* obj = (UiObject*)malloc(sizeof(UiObject));
 
-	UiWindow* window = new UiWindow(title);
+	UiWindow* window = new UiWindow(title, obj);
 	obj->widget = window;
 
 	return obj;