sidebar nicklist keybindings

Author: Hummer12007

CHANGELOG.md

@@ -8,6 +8,7 @@ Added:
 - Settings to configure card and imagge preview dimensions 
 - Support for transparent background.
 - Settings to show nicklist in the sidebar together with the buflist (`sidebar.show_nicklist`, `sidebar.split`, `sidebar.buflist_space`, `sidebar.nicklist_space`)
+- Keybindings for toggling sidebar nicklist (made `toggle_nick_list` context-dependent, added `toggle_pane_nick_list` and `toggle_sidebar_nick_list`)
 
 Fixed:
 

book/src/configuration/keyboard.md

@@ -43,6 +43,8 @@ Note you can disable a key bind by setting it to `"noop"` or `"none"`.
 | `leave_buffer`                 | Leave channel or close query | <kbd>⌘</kbd> + <kbd>shift</kbd> + <kbd>w</kbd>      | <kbd>ctrl</kbd> + <kbd>shift</kbd> + <kbd>w</kbd>   |
 | `mark_as_read`                 | Mark focused buffer as read  | <kbd>⌘</kbd> + <kbd>shift</kbd> + <kbd>m</kbd>      | <kbd>ctrl</kbd> + <kbd>shift</kbd> + <kbd>m</kbd>   |
 | `toggle_nick_list`             | Toggle nick list             | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>m</kbd>          | <kbd>ctrl</kbd> + <kbd>alt</kbd> + <kbd>m</kbd>     |
+| `toggle_buffer_nick_list`      | Toggle nick list in buffer   | None                                                | None                                                |
+| `toggle_sidebar_nick_list`     | Toggle nick list in sidebar  | None                                                | None                                                |
 | `toggle_topic`                 | Toggle topic                 | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>t</kbd>          | <kbd>ctrl</kbd> + <kbd>alt</kbd> + <kbd>t</kbd>     |
 | `toggle_sidebar`               | Toggle sidebar               | <kbd>⌘</kbd> + <kbd>⌥</kbd> + <kbd>b</kbd>          | <kbd>ctrl</kbd> + <kbd>alt</kbd> + <kbd>b</kbd>     |
 | `toggle_fullscreen`            | Toggle fullscreen            | <kbd>⌘</kbd> + <kbd>ctrl</kbd> + <kbd>f</kbd>       | <kbd>F11</kbd>                                      |

data/src/config/keys.rs

@@ -16,6 +16,8 @@ pub struct Keyboard {
     pub cycle_previous_buffer: KeyBind,
     pub leave_buffer: KeyBind,
     pub toggle_nick_list: KeyBind,
+    pub toggle_buffer_nick_list: KeyBind,
+    pub toggle_sidebar_nick_list: KeyBind,
     pub toggle_topic: KeyBind,
     pub toggle_sidebar: KeyBind,
     pub toggle_fullscreen: KeyBind,
@@ -51,6 +53,8 @@ impl Default for Keyboard {
             cycle_previous_buffer: KeyBind::cycle_previous_buffer(),
             leave_buffer: KeyBind::leave_buffer(),
             toggle_nick_list: KeyBind::toggle_nick_list(),
+            toggle_buffer_nick_list: KeyBind::Unbind,
+            toggle_sidebar_nick_list: KeyBind::Unbind,
             toggle_sidebar: KeyBind::toggle_sidebar(),
             toggle_topic: KeyBind::toggle_topic(),
             toggle_fullscreen: KeyBind::toggle_fullscreen(),
@@ -89,6 +93,14 @@ impl Keyboard {
             shortcut(self.cycle_previous_buffer.clone(), CyclePreviousBuffer),
             shortcut(self.leave_buffer.clone(), LeaveBuffer),
             shortcut(self.toggle_nick_list.clone(), ToggleNicklist),
+            shortcut(
+                self.toggle_buffer_nick_list.clone(),
+                ToggleBufferNicklist,
+            ),
+            shortcut(
+                self.toggle_sidebar_nick_list.clone(),
+                ToggleSidebarNicklist,
+            ),
             shortcut(self.toggle_topic.clone(), ToggleTopic),
             shortcut(self.toggle_sidebar.clone(), ToggleSidebar),
             shortcut(self.toggle_fullscreen.clone(), ToggleFullscreen),

data/src/shortcut.rs

@@ -34,6 +34,8 @@ pub enum Command {
     CyclePreviousBuffer,
     LeaveBuffer,
     ToggleNicklist,
+    ToggleBufferNicklist,
+    ToggleSidebarNicklist,
     ToggleTopic,
     ToggleSidebar,
     ToggleFullscreen,

src/screen/dashboard.rs

@@ -1013,15 +1013,44 @@ impl Dashboard {
                         }
                     }
                     ToggleNicklist => {
-                        if let Some((_, _, pane)) = self.get_focused_mut() {
-                            if let Some(buffer) = pane.buffer.data() {
+                        if config.sidebar.show_nicklist
+                            && !config.sidebar.position.is_horizontal()
+                        {
+                            self.side_menu.toggle_nicklist();
+                        } else {
+                            if let Some((_, _, pane)) = self.get_focused_mut()
+                                && let Some(buffer) = pane.buffer.data()
+                            {
                                 let settings = self.buffer_settings.entry(
                                     &buffer,
                                     Some(config.buffer.clone().into()),
                                 );
                                 settings.channel.nicklist.toggle_visibility();
                             }
+                        }
+
+                        self.last_changed = Some(Instant::now());
+                        return (Task::none(), None);
+                    }
+                    ToggleBufferNicklist => {
+                        if let Some((_, _, pane)) = self.get_focused_mut()
+                            && let Some(buffer) = pane.buffer.data()
+                        {
+                            let settings = self.buffer_settings.entry(
+                                &buffer,
+                                Some(config.buffer.clone().into()),
+                            );
+                            settings.channel.nicklist.toggle_visibility();
+                        }
 
+                        self.last_changed = Some(Instant::now());
+                        return (Task::none(), None);
+                    }
+                    ToggleSidebarNicklist => {
+                        if config.sidebar.show_nicklist
+                            && !config.sidebar.position.is_horizontal()
+                        {
+                            self.side_menu.toggle_nicklist();
                             self.last_changed = Some(Instant::now());
                             return (Task::none(), None);
                         }

src/screen/dashboard/sidebar.rs

@@ -70,6 +70,7 @@ pub enum Event {
 #[derive(Clone)]
 pub struct Sidebar {
     pub hidden: bool,
+    nicklist_hidden: bool,
     reloading_config: bool,
 }
 
@@ -83,6 +84,7 @@ impl Sidebar {
     pub fn new() -> Self {
         Self {
             hidden: false,
+            nicklist_hidden: false,
             reloading_config: false,
         }
     }
@@ -91,6 +93,10 @@ impl Sidebar {
         self.hidden = !self.hidden;
     }
 
+    pub fn toggle_nicklist(&mut self) {
+        self.nicklist_hidden = !self.nicklist_hidden;
+    }
+
     pub fn update(
         &mut self,
         message: Message,
@@ -570,26 +576,29 @@ impl Sidebar {
 
             match config.sidebar.position {
                 sidebar::Position::Left | sidebar::Position::Right => {
-                    let nicklist: Option<Element<'a, Message>> =
-                        if config.sidebar.show_nicklist {
-                            focused_channel_nicklist(
-                                panes, focus, clients, config, theme, width,
-                            )
-                            .map(|list| {
-                                container(list)
-                                    .padding([0, 2])
-                                    .height(if config.sidebar.split {
-                                        Length::FillPortion(
-                                            config.sidebar.nicklist_space,
-                                        )
-                                    } else {
-                                        Length::Fill
-                                    })
-                                    .into()
-                            })
-                        } else {
-                            None
-                        };
+                    let nicklist: Option<Element<'a, Message>> = if config
+                        .sidebar
+                        .show_nicklist
+                        && !self.nicklist_hidden
+                    {
+                        focused_channel_nicklist(
+                            panes, focus, clients, config, theme, width,
+                        )
+                        .map(|list| {
+                            container(list)
+                                .padding([0, 2])
+                                .height(if config.sidebar.split {
+                                    Length::FillPortion(
+                                        config.sidebar.nicklist_space,
+                                    )
+                                } else {
+                                    Length::Fill
+                                })
+                                .into()
+                        })
+                    } else {
+                        None
+                    };
 
                     let buflist_height =
                         if config.sidebar.split && nicklist.is_some() {