From ff776f02a68403ff1681a49ffdb5ce9bc9d5fb9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Fri, 10 Nov 2023 15:23:25 +0100
Subject: [PATCH] misc: Do not show arrows on some popovers

---
 src/session/view/content/room_history/mod.rs              | 2 +-
 .../read_receipts_list/read_receipts_popover.ui           | 1 +
 src/session/view/sidebar/mod.rs                           | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/session/view/content/room_history/mod.rs b/src/session/view/content/room_history/mod.rs
index ceddc934..0bc6b212 100644
--- a/src/session/view/content/room_history/mod.rs
+++ b/src/session/view/content/room_history/mod.rs
@@ -751,7 +751,7 @@ impl RoomHistory {
     pub fn item_context_menu(&self) -> &gtk::PopoverMenu {
         self.imp()
             .item_context_menu
-            .get_or_init(|| gtk::PopoverMenu::from_model(gio::MenuModel::NONE))
+            .get_or_init(|| gtk::PopoverMenu::builder().has_arrow(false).build())
     }
 
     pub fn item_reaction_chooser(&self) -> &ReactionChooser {
diff --git a/src/session/view/content/room_history/read_receipts_list/read_receipts_popover.ui b/src/session/view/content/room_history/read_receipts_list/read_receipts_popover.ui
index f56f77ab..1b31bec5 100644
--- a/src/session/view/content/room_history/read_receipts_list/read_receipts_popover.ui
+++ b/src/session/view/content/room_history/read_receipts_list/read_receipts_popover.ui
@@ -6,6 +6,7 @@
     </style>
     <property name="autohide">true</property>
     <property name="width-request">260</property>
+    <property name="has-arrow">false</property>
     <property name="child">
       <object class="GtkScrolledWindow" id="scrolled_window">
         <property name="propagate-natural-height">true</property>
diff --git a/src/session/view/sidebar/mod.rs b/src/session/view/sidebar/mod.rs
index 74169eac..81965b87 100644
--- a/src/session/view/sidebar/mod.rs
+++ b/src/session/view/sidebar/mod.rs
@@ -350,8 +350,12 @@ impl Sidebar {
 
     pub fn room_row_popover(&self) -> &gtk::PopoverMenu {
         let imp = self.imp();
-        imp.room_row_popover
-            .get_or_init(|| gtk::PopoverMenu::from_model(Some(&*imp.room_row_menu)))
+        imp.room_row_popover.get_or_init(|| {
+            gtk::PopoverMenu::builder()
+                .menu_model(&*imp.room_row_menu)
+                .has_arrow(false)
+                .build()
+        })
     }
 
     /// Returns the parent `Window` containing the `Sidebar`