better working tray

include/widgets/tray.hpp

@@ -13,7 +13,9 @@
 #include <gtkmm/popovermenu.h>
 #include <map>
 #include <memory>
+#include <optional>
 #include <string>
+#include <vector>
 
 #include "services/tray.hpp"
 #include "components/base/button.hpp"
@@ -35,16 +37,15 @@ class TrayIconWidget : public Button {
     Glib::RefPtr<Gtk::PopoverMenu> menuPopover;
     Glib::RefPtr<Gio::SimpleActionGroup> menuActions;
     Glib::RefPtr<Gio::MenuModel> menuModel;
-    sigc::connection menuChangedConnection;
     bool menuPopupPending = false;
+    bool menuRequestInFlight = false;
+    bool hasRemoteMenu = false;
     double pendingX       = 0.0;
     double pendingY       = 0.0;
 
     void on_primary_released(int n_press, double x, double y);
     void on_secondary_released(int n_press, double x, double y);
-    bool ensure_menu();
-    void on_menu_items_changed(guint position, guint removed, guint added);
-    void try_popup();
+    void on_menu_layout_ready(std::optional<TrayService::MenuNode> layout);
     void
     populate_menu_items(const std::vector<TrayService::MenuNode> &nodes,
                         const Glib::RefPtr<Gio::Menu> &menu,