Fix regression in contact context menu not working

Author: radare

src/chat_row.vala

@@ -152,40 +152,48 @@ namespace Dc {
             var entry = find_chat_entry (chat_store, chat_id);
             if (entry != null) is_pinned = entry.is_pinned;
 
-            var menu = new GLib.Menu ();
-            menu.append (is_pinned ? "Unpin" : "Pin", "win.chat-pin");
-            menu.append ("Chat Info", "win.chat-info");
-            menu.append ("Delete for Me", "win.chat-delete");
+            var popover = new Gtk.Popover ();
+            popover.has_arrow = false;
+            popover.set_parent (parent);
+            popover.set_pointing_to ({ (int) x, (int) y, 1, 1 });
+
+            var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            box.add_css_class ("menu");
 
-            var pin_action = new SimpleAction ("chat-pin", null);
-            pin_action.activate.connect (() => {
+            var pin_btn = make_menu_button (is_pinned ? "Unpin" : "Pin");
+            pin_btn.clicked.connect (() => {
+                popover.popdown ();
                 toggle_pin.begin (chat_id, is_pinned);
             });
-            var info_action = new SimpleAction ("chat-info", null);
-            info_action.activate.connect (() => {
+            box.append (pin_btn);
+
+            var info_btn = make_menu_button ("Chat Info");
+            info_btn.clicked.connect (() => {
+                popover.popdown ();
                 show_info.begin (chat_id);
             });
-            var delete_action = new SimpleAction ("chat-delete", null);
-            delete_action.activate.connect (() => {
+            box.append (info_btn);
+
+            var del_btn = make_menu_button ("Delete for Me");
+            del_btn.clicked.connect (() => {
+                popover.popdown ();
                 confirm_delete.begin (chat_id);
             });
+            box.append (del_btn);
 
-            window.add_action (pin_action);
-            window.add_action (info_action);
-            window.add_action (delete_action);
-
-            var popover = new Gtk.PopoverMenu.from_model (menu);
-            popover.set_parent (parent);
-            popover.set_pointing_to ({ (int) x, (int) y, 1, 1 });
-            popover.closed.connect (() => {
-                window.remove_action ("chat-pin");
-                window.remove_action ("chat-info");
-                window.remove_action ("chat-delete");
-                popover.unparent ();
-            });
+            popover.child = box;
+            popover.closed.connect (() => { popover.unparent (); });
             popover.popup ();
         }
 
+        private static Gtk.Button make_menu_button (string label) {
+            var btn = new Gtk.Button.with_label (label);
+            btn.add_css_class ("flat");
+            ((Gtk.Label) btn.child).xalign = 0;
+            ((Gtk.Label) btn.child).halign = Gtk.Align.START;
+            return btn;
+        }
+
         private async void toggle_pin (int chat_id, bool currently_pinned) {
             try {
                 string visibility = currently_pinned ? "Normal" : "Pinned";

src/window.vala

@@ -122,18 +122,21 @@ namespace Dc {
 
             chat_listbox = new Gtk.ListBox ();
             chat_listbox.selection_mode = Gtk.SelectionMode.SINGLE;
+            chat_listbox.can_focus = false;
             chat_listbox.add_css_class ("navigation-sidebar");
             chat_listbox.set_filter_func (filter_chats);
             chat_listbox.row_selected.connect (on_chat_selected);
 
             /* Right-click context menu */
             var right_click = new Gtk.GestureClick ();
             right_click.button = 3; /* secondary button */
+            right_click.propagation_phase = Gtk.PropagationPhase.CAPTURE;
             right_click.pressed.connect ((n, x, y) => {
                 var row = chat_listbox.get_row_at_y ((int) y);
                 if (row == null) return;
                 var chat_row = row.child as ChatRow;
                 if (chat_row == null) return;
+                right_click.set_state (Gtk.EventSequenceState.CLAIMED);
                 if (chat_menu != null)
                     chat_menu.show (chat_row.chat_id, x, y, chat_listbox);
             });