Merge pull request #630 from squidowl/remove-scroll-to-backlog-button

squidowl · Oct 26, 2024 · eb072f5 · eb072f5
2 parents c02ccd1 + f53a3b6
commit eb072f5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 52 deletions.
diff --git a/src/icon.rs b/src/icon.rs
@@ -92,10 +92,6 @@ pub fn scroll_to_bottom<'a>() -> Text<'a> {
     to_text('\u{E814}')
 }
 
-pub fn scroll_to_unread<'a>() -> Text<'a> {
-    to_text('\u{F0E0}')
-}
-
 fn to_text<'a>(unicode: char) -> Text<'a> {
     text(unicode.to_string())
         .line_height(LineHeight::Relative(1.0))

diff --git a/src/screen/dashboard.rs b/src/screen/dashboard.rs
@@ -401,23 +401,6 @@ impl Dashboard {
                     pane::Message::MaximizePane => self.maximize_pane(),
                     pane::Message::Popout => return (self.popout_pane(main_window), None),
                     pane::Message::Merge => return (self.merge_pane(config, main_window), None),
-                    pane::Message::ScrollToBacklog => {
-                        if let Some((window, pane)) = self.focus {
-                            if let Some(state) = self.panes.get_mut(main_window.id, window, pane) {
-                                return (
-                                    state.buffer.scroll_to_backlog(&self.history, config).map(
-                                        move |message| {
-                                            Message::Pane(
-                                                window,
-                                                pane::Message::Buffer(pane, message),
-                                            )
-                                        },
-                                    ),
-                                    None,
-                                );
-                            }
-                        }
-                    }
                     pane::Message::ScrollToBottom => {
                         if let Some((window, pane)) = self.focus {
                             if let Some(state) = self.panes.get_mut(main_window.id, window, pane) {

diff --git a/src/screen/dashboard/pane.rs b/src/screen/dashboard/pane.rs
@@ -21,7 +21,6 @@ pub enum Message {
     ToggleShowTopic,
     Popout,
     Merge,
-    ScrollToBacklog,
     ScrollToBottom,
 }
 
@@ -161,36 +160,23 @@ impl TitleBar {
         let mut controls = row![].spacing(2);
 
         if let Buffer::Channel(state) = &buffer {
-            // Show scroll-to-bottom / scroll-to-backlog depending if scrollable is anchored to the end or not
-            let (icon, tooltip_text, message) =
-                if buffer.is_scrolled_to_bottom().unwrap_or_default() {
-                    (
-                        icon::scroll_to_unread(),
-                        "Scroll to Backlog",
-                        Message::ScrollToBacklog,
-                    )
-                } else {
-                    (
-                        icon::scroll_to_bottom(),
-                        "Scroll to Bottom",
-                        Message::ScrollToBottom,
-                    )
-                };
-
-            let scrollable_button = button(center(icon))
-                .padding(5)
-                .width(22)
-                .height(22)
-                .on_press(message)
-                .style(|theme, status| theme::button::secondary(theme, status, false));
-
-            let scrollable_button_with_tooltip = tooltip(
-                scrollable_button,
-                show_tooltips.then_some(tooltip_text),
-                tooltip::Position::Bottom,
-            );
-
-            controls = controls.push(scrollable_button_with_tooltip);
+            // Show scroll-to-bottom if scrollable isnt scrolled to bottom.
+            if !buffer.is_scrolled_to_bottom().unwrap_or_default() {
+                let scrollable_button = button(center(icon::scroll_to_bottom()))
+                    .padding(5)
+                    .width(22)
+                    .height(22)
+                    .on_press(Message::ScrollToBottom)
+                    .style(|theme, status| theme::button::secondary(theme, status, false));
+
+                let scrollable_button_with_tooltip = tooltip(
+                    scrollable_button,
+                    show_tooltips.then_some("Scroll to Bottom"),
+                    tooltip::Position::Bottom,
+                );
+
+                controls = controls.push(scrollable_button_with_tooltip);
+            }
 
             // Show topic button only if there is a topic to show
             if let Some(topic) = clients.get_channel_topic(&state.server, &state.channel) {