3 files changed, 24 insertions, 40 deletions
diff --git a/examples/js/simple-bar/widget/Bar.tsx b/examples/js/simple-bar/widget/Bar.tsx
index efc065a..029aca1 100644
--- a/examples/js/simple-bar/widget/Bar.tsx
+++ b/examples/js/simple-bar/widget/Bar.tsx
@@ -13,19 +13,14 @@ function SysTray() {
 
     return <box>
         {bind(tray, "items").as(items => items.map(item => {
-            if (item.iconThemePath)
-                App.add_icons(item.iconThemePath)
-
-            const menu = item.create_menu()
-
-            return <button
+            
+            return <menubutton
                 tooltipMarkup={bind(item, "tooltipMarkup")}
-                onDestroy={() => menu?.destroy()}
-                onClickRelease={self => {
-                    menu?.popup_at_widget(self, Gdk.Gravity.SOUTH, Gdk.Gravity.NORTH, null)
-                }}>
+                usePopover={false}
+                actionGroup={bind(item, "action-group").as(ag => { return { prefix: "dbusmenu", actionGroup: ag}})}
+                menuModel={bind(item, "menu-model")} >
                 <icon gIcon={bind(item, "gicon")} />
-            </button>
+            </menubutton>
         }))}
     </box>
 }
diff --git a/examples/lua/simple-bar/widget/Bar.lua b/examples/lua/simple-bar/widget/Bar.lua
index bf230bb..843e292 100644
--- a/examples/lua/simple-bar/widget/Bar.lua
+++ b/examples/lua/simple-bar/widget/Bar.lua
@@ -19,24 +19,16 @@ local function SysTray()
 	return Widget.Box({
 		bind(tray, "items"):as(function(items)
 			return map(items, function(item)
-				if item.icon_theme_path ~= nil then
-					App:add_icons(item.icon_theme_path)
-				end
-
-				local menu = item:create_menu()
-
-				return Widget.Button({
+				return Widget.MenuButton({
 					tooltip_markup = bind(item, "tooltip_markup"),
-					on_destroy = function()
-						if menu ~= nil then
-							menu:destroy()
-						end
-					end,
-					on_click_release = function(self)
-						if menu ~= nil then
-							menu:popup_at_widget(self, Gdk.Gravity.SOUTH, Gdk.Gravity.NORTH, nil)
-						end
-					end,
+          use_popover = false,
+					menu_model = bind(item, "menu-model"),
+          action_group = bind(item, "action-group"):as(function(ag)
+            return {
+              prefix = "dbusmenu",
+              action_group = ag
+            }
+          end),
 					Widget.Icon({
 						g_icon = bind(item, "gicon"),
 					}),
diff --git a/examples/vala/simple-bar/widget/Bar.vala b/examples/vala/simple-bar/widget/Bar.vala
index ba4062c..3893ec5 100644
--- a/examples/vala/simple-bar/widget/Bar.vala
+++ b/examples/vala/simple-bar/widget/Bar.vala
@@ -113,22 +113,19 @@ class SysTray : Gtk.Box {
 
         var item = tray.get_item(id);
 
-        var menu = item.create_menu();
-        var btn = new Astal.Button();
+        var btn = new Gtk.MenuButton() {
+          use_popover = false
+        };
         var icon = new Astal.Icon();
 
-        btn.clicked.connect(() => {
-            if (menu != null)
-                menu.popup_at_widget(this, Gdk.Gravity.SOUTH, Gdk.Gravity.NORTH, null);
-        });
-
-        btn.destroy.connect(() => {
-            if (menu != null)
-                menu.destroy();
-        });
-
         item.bind_property("tooltip-markup", btn, "tooltip-markup", BindingFlags.SYNC_CREATE);
         item.bind_property("gicon", icon, "g-icon", BindingFlags.SYNC_CREATE);
+        item.bind_property("menu-model", btn, "menu-model", BindingFlags.SYNC_CREATE);
+        btn.insert_action_group("dbusmenu", item.action_group);
+        item.notify["action-group"].connect(() => {
+          btn.insert_action_group("dbusmenu", item.action_group);
+        });
+
         btn.add(icon);
         add(btn);
         btn.show_all();