ui/winui/commandbar.cpp

branch
newapi
changeset 213
7e39db525fd9
parent 208
f632bc0589ab
child 226
4eef1d49f794
--- a/ui/winui/commandbar.cpp	Thu Oct 12 14:09:04 2023 +0200
+++ b/ui/winui/commandbar.cpp	Thu Oct 12 16:03:35 2023 +0200
@@ -36,6 +36,7 @@
 
 #include "button.h"
 #include "appmenu.h"
+#include "icons.h"
 
 using namespace winrt;
 using namespace Microsoft::UI::Xaml;
@@ -131,6 +132,9 @@
 		button.Label(wlabel);
 		free(wlabel);
 	}
+	if(item->args.icon) {
+		button.Icon(ui_get_icon(item->args.icon));
+	}
 
 	// register callback
 	if (item->args.onclick) {
@@ -157,6 +161,9 @@
 		button.Label(wlabel);
 		free(wlabel);
 	}
+	if (item->args.icon) {
+		button.Icon(ui_get_icon(item->args.icon));
+	}
 
 	UiVar* var = uic_widget_var(obj->ctx, obj->ctx, nullptr, item->args.varname, UI_VAR_INTEGER);
 	if (var) {	
@@ -192,6 +199,9 @@
 		button.Label(wlabel);
 		free(wlabel);
 	}
+	if (item->args.icon) {
+		button.Icon(ui_get_icon(item->args.icon));
+	}
 
 	MenuFlyoutItem mi = MenuFlyoutItem();
 

mercurial