fix split false

Author: Hummer12007

src/buffer/channel.rs

@@ -424,7 +424,7 @@ pub(crate) mod nick_list {
     use crate::widget::{Element, selectable_text};
     use crate::{Theme, font, theme};
 
-    pub fn view<'a>(
+    pub fn content<'a>(
         server: &'a Server,
         prefix: &'a [isupport::PrefixMap],
         channel: &'a target::Channel,
@@ -453,7 +453,7 @@ pub(crate) mod nick_list {
             }
         };
 
-        let content = column(users.into_iter().flatten().map(|user| {
+        column(users.into_iter().flatten().map(|user| {
             let content = selectable_text(
                 user.display(nicklist_config.show_access_levels, None),
             )
@@ -485,14 +485,27 @@ pub(crate) mod nick_list {
                 theme,
                 &config.buffer.channel.nicklist.click,
             )
-        }));
-
-        Scrollable::new(content)
-            .direction(scrollable::Direction::Vertical(
-                scrollable::Scrollbar::new().width(1).scroller_width(1),
-            ))
-            .width(Length::Shrink)
-            .style(theme::scrollable::hidden)
-            .into()
+        }))
+        .into()
+    }
+
+    pub fn view<'a>(
+        server: &'a Server,
+        prefix: &'a [isupport::PrefixMap],
+        channel: &'a target::Channel,
+        users: Option<&'a ChannelUsers>,
+        our_user: Option<&'a User>,
+        config: &'a Config,
+        theme: &'a Theme,
+    ) -> Element<'a, Message> {
+        Scrollable::new(content(
+            server, prefix, channel, users, our_user, config, theme,
+        ))
+        .direction(scrollable::Direction::Vertical(
+            scrollable::Scrollbar::new().width(1).scroller_width(1),
+        ))
+        .width(Length::Shrink)
+        .style(theme::scrollable::hidden)
+        .into()
     }
 }

src/screen/dashboard/sidebar.rs

@@ -576,52 +576,61 @@ impl Sidebar {
 
             match config.sidebar.position {
                 sidebar::Position::Left | sidebar::Position::Right => {
-                    let nicklist: Option<Element<'a, Message>> = if config
-                        .sidebar
-                        .show_nicklist
-                        && !self.nicklist_hidden
-                    {
-                        focused_channel_nicklist(
+                    let show_nicklist =
+                        config.sidebar.show_nicklist && !self.nicklist_hidden;
+
+                    let direction = scrollable::Direction::Vertical(
+                        scrollable::Scrollbar::default()
+                            .width(config.sidebar.scrollbar.width)
+                            .scroller_width(
+                                config.sidebar.scrollbar.scroller_width,
+                            ),
+                    );
+
+                    let mut nicklist: Option<Element<'a, Message>> = None;
+                    let mut buflist_content =
+                        Column::with_children(buffers).spacing(0);
+
+                    if show_nicklist
+                        && let Some(list) = focused_channel_nicklist(
                             panes, focus, clients, config, theme, width,
                         )
-                        .map(|list| {
-                            container(list)
-                                .padding([0, 2])
-                                .height(if config.sidebar.split {
-                                    Length::FillPortion(
+                    {
+                        if config.sidebar.split {
+                            let scrollable = Scrollable::new(list)
+                                .direction(direction)
+                                .width(Length::Shrink);
+
+                            nicklist = Some(
+                                container(scrollable)
+                                    .padding([0, 2])
+                                    .height(Length::FillPortion(
                                         config.sidebar.nicklist_space,
-                                    )
-                                } else {
-                                    Length::Fill
-                                })
-                                .into()
-                        })
-                    } else {
-                        None
-                    };
+                                    ))
+                                    .into(),
+                            );
+                        } else {
+                            buflist_content = buflist_content
+                                .push(container(list).padding([0, 2]));
+                        }
+                    }
 
                     let buflist_height =
                         if config.sidebar.split && nicklist.is_some() {
                             Length::FillPortion(config.sidebar.buflist_space)
-                        } else if nicklist.is_some() {
-                            Length::Shrink
                         } else {
                             Length::Fill
                         };
 
-                    let buflist = Scrollable::new(
-                        Column::with_children(buffers).spacing(0),
-                    )
-                    .direction(scrollable::Direction::Vertical(
-                        scrollable::Scrollbar::default()
-                            .width(config.sidebar.scrollbar.width)
-                            .scroller_width(
-                                config.sidebar.scrollbar.scroller_width,
-                            ),
-                    ))
-                    .height(buflist_height);
+                    let buflist = Scrollable::new(buflist_content)
+                        .direction(direction)
+                        .height(buflist_height);
 
-                    let content = column![buflist, nicklist, user_menu_button,];
+                    let content = if show_nicklist && !config.sidebar.split {
+                        column![buflist, user_menu_button]
+                    } else {
+                        column![buflist, nicklist, user_menu_button]
+                    };
 
                     container(content)
                 }
@@ -720,7 +729,7 @@ fn focused_channel_nicklist<'a>(
 
     let users = clients.get_channel_users(server, channel);
     let prefix = clients.get_prefix(server);
-    let list = crate::buffer::channel::nick_list::view(
+    let list = crate::buffer::channel::nick_list::content(
         server, prefix, channel, users, None, config, theme,
     )
     .map(Message::Nicklist);