From 04bc8c6aef1d248ee81baf75cfc9f030d9dc5f3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <zecakeh@tedomum.fr>
Date: Sun, 29 Dec 2024 09:55:39 +0100
Subject: [PATCH] room-history: Do not show scroll button when context menu is
 open

---
 src/session/view/content/room_history/mod.rs | 44 +++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/session/view/content/room_history/mod.rs b/src/session/view/content/room_history/mod.rs
index 2e50fd16..4f27352d 100644
--- a/src/session/view/content/room_history/mod.rs
+++ b/src/session/view/content/room_history/mod.rs
@@ -109,7 +109,7 @@ mod imp {
         is_auto_scrolling: Cell<bool>,
         /// Whether the room history should stick to the newest message in the
         /// timeline.
-        #[property(get, explicit_notify)]
+        #[property(get)]
         is_sticky: Cell<bool>,
         /// The `GtkSelectionModel` used in the list view.
         selection_model: OnceCell<gtk::NoSelection>,
@@ -300,6 +300,7 @@ mod imp {
                     } else {
                         tracing::trace!("User scrolled");
                         imp.set_sticky(is_at_bottom);
+                        imp.update_scroll_btn();
                     }
 
                     // Remove the typing row if we scroll up.
@@ -319,7 +320,10 @@ mod imp {
                     tracing::trace!("Scroll upper changed");
                     if imp.is_sticky.get() {
                         imp.scroll_down();
+                    } else {
+                        imp.update_scroll_btn();
                     }
+
                     imp.load_more_events_if_needed();
                 }
             ));
@@ -330,21 +334,15 @@ mod imp {
                     tracing::trace!("Scroll page size changed");
                     if imp.is_sticky.get() {
                         imp.scroll_down();
+                    } else {
+                        imp.update_scroll_btn();
                     }
+
                     imp.load_more_events_if_needed();
                 }
             ));
         }
 
-        /// Whether the list view is scrolled at the bottom.
-        pub(super) fn is_at_bottom(&self) -> bool {
-            let adj = self
-                .listview
-                .vadjustment()
-                .expect("GtkListView has a vadjustment");
-            (adj.value() + adj.page_size() - adj.upper()).abs() < 0.0001
-        }
-
         /// Initialize the drop target.
         fn init_drop_target(&self) {
             let target = gtk::DropTarget::new(
@@ -555,17 +553,12 @@ mod imp {
             }
             tracing::trace!("is-sticky changed");
 
-            if !is_sticky {
-                self.scroll_btn_revealer.set_visible(true);
-            }
-            self.scroll_btn_revealer.set_reveal_child(!is_sticky);
-
             self.is_sticky.set(is_sticky);
             self.obj().notify_is_sticky();
         }
 
         /// Set whether the current room history scrolling is automatic.
-        pub(super) fn set_is_auto_scrolling(&self, is_auto: bool) {
+        fn set_is_auto_scrolling(&self, is_auto: bool) {
             tracing::trace!("set_is_auto_scrolling: {is_auto:?}");
             if self.is_auto_scrolling.get() == is_auto {
                 return;
@@ -593,6 +586,25 @@ mod imp {
             }
         }
 
+        /// Whether the list view is scrolled at the bottom.
+        pub(super) fn is_at_bottom(&self) -> bool {
+            let adj = self
+                .listview
+                .vadjustment()
+                .expect("GtkListView has a vadjustment");
+            (adj.value() + adj.page_size() - adj.upper()).abs() < 0.0001
+        }
+
+        /// Update the visibility of the scroll button.
+        fn update_scroll_btn(&self) {
+            let is_at_bottom = self.is_at_bottom();
+
+            if !is_at_bottom {
+                self.scroll_btn_revealer.set_visible(true);
+            }
+            self.scroll_btn_revealer.set_reveal_child(!is_at_bottom);
+        }
+
         /// Update the room menu for the current state.
         fn update_room_menu(&self) {
             let Some(room) = self.room.obj() else {