diff options
| -rw-r--r-- | src/event_exec.rs | 4 | ||||
| -rw-r--r-- | src/tab.rs | 14 | ||||
| -rw-r--r-- | src/term_manager.rs | 6 |
3 files changed, 8 insertions, 16 deletions
diff --git a/src/event_exec.rs b/src/event_exec.rs index f908b66..3d3613d 100644 --- a/src/event_exec.rs +++ b/src/event_exec.rs @@ -527,7 +527,7 @@ impl EventAction { Mode::Navigate(Navigate::CliInfo) => status.cli_info.next(), Mode::Navigate(Navigate::EncryptedDrive) => status.encrypted_devices.next(), Mode::InputCompleted(_) => status.selected().completion.next(), - Mode::Tree => status.selected().select_next()?, + Mode::Tree => status.selected().tree_select_next()?, _ => (), }; status.update_second_pane_for_preview() @@ -898,7 +898,7 @@ impl EventAction { let (tree, _, _) = tab.directory.tree.explore_position(false); tree.node.toggle_fold(); tab.directory.make_preview(); - tab.select_next() + tab.tree_select_next() } /// Unfold every child node in the tree. @@ -16,6 +16,7 @@ use crate::opener::execute_in_child; use crate::preview::{Directory, Preview}; use crate::selectable_content::SelectableContent; use crate::shortcut::Shortcut; +use crate::sort::SortKind; use crate::trees::FileSystem; use crate::users::Users; use crate::utils::{filename_from_path, row_to_window_index, set_clipboard}; @@ -436,7 +437,7 @@ impl Tab { self.tree = FileSystem::new( path, 5, - self.path_content.sort_kind.clone(), + SortKind::tree_default(), users, self.show_hidden, &self.filter, @@ -541,17 +542,6 @@ impl Tab { self.tree_select_first_child() } - /// Select the previous sibling of the current node. - pub fn select_prev(&mut self) -> Result<()> { - self.tree.select_prev(); - Ok(()) - } - - /// Select the next sibling of the current node. - pub fn select_next(&mut self) -> Result<()> { - self.tree.select_next() - } - /// Copy the selected filename to the clipboard. Only the filename. pub fn filename_to_clipboard(&self) -> Result<()> { set_clipboard( diff --git a/src/term_manager.rs b/src/term_manager.rs index 945745f..bc119f4 100644 --- a/src/term_manager.rs +++ b/src/term_manager.rs @@ -448,10 +448,12 @@ impl<'a> WinMain<'a> { } else { 0 }; - let col_tree_prefix = canvas.print(row, left_margin + col_metadata, prefix)?; + let offset = if i == 0 { 1 } else { 0 }; + + let col_tree_prefix = canvas.print(row, left_margin + col_metadata + offset, prefix)?; canvas.print_with_attr( row, - left_margin + col_metadata + col_tree_prefix, + left_margin + col_metadata + col_tree_prefix + offset, &colored_string.text, attr, )?; |