summaryrefslogtreecommitdiffstats
path: root/src/interactive/app/eventloop.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/interactive/app/eventloop.rs')
-rw-r--r--src/interactive/app/eventloop.rs27
1 files changed, 18 insertions, 9 deletions
diff --git a/src/interactive/app/eventloop.rs b/src/interactive/app/eventloop.rs
index f03c55b..1053539 100644
--- a/src/interactive/app/eventloop.rs
+++ b/src/interactive/app/eventloop.rs
@@ -194,7 +194,11 @@ impl AppState {
is_finished: bool,
) {
let tree_view = self.tree_view(traversal);
- self.entries = tree_view.sorted_entries(self.navigation().view_root, self.sorting);
+ self.entries = tree_view.sorted_entries(
+ self.navigation().view_root,
+ self.sorting,
+ self.scan.is_some(),
+ );
if !self.received_events {
let previously_selected_entry =
@@ -253,11 +257,7 @@ impl AppState {
self.cycle_focus(window);
}
Char('/') if !glob_focussed => {
- if self.scan.is_some() {
- self.message = Some("glob search disabled during traversal".into());
- } else {
- self.toggle_glob_search(window);
- }
+ self.toggle_glob_search(window);
}
Char('?') if !glob_focussed => self.toggle_help_pane(window),
Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) && !glob_focussed => {
@@ -440,7 +440,11 @@ impl AppState {
tree.remove_entries(index, remove_root_node);
tree.recompute_sizes_recursively(parent_index);
- self.entries = tree.sorted_entries(self.navigation().view_root, self.sorting);
+ self.entries = tree.sorted_entries(
+ self.navigation().view_root,
+ self.sorting,
+ self.scan.is_some(),
+ );
self.navigation_mut().selected = self.entries.first().map(|e| e.index);
self.scan = Some(FilesystemScan {
@@ -493,7 +497,8 @@ impl AppState {
traversal: tree_view.traversal,
glob_tree_root: Some(tree_root),
};
- let new_entries = glob_tree_view.sorted_entries(tree_root, self.sorting);
+ let new_entries =
+ glob_tree_view.sorted_entries(tree_root, self.sorting, self.scan.is_some());
let new_entries = self
.navigation_mut()
@@ -545,7 +550,11 @@ impl AppState {
window.glob_pane = None;
tree_view.glob_tree_root.take();
- self.entries = tree_view.sorted_entries(self.navigation().view_root, self.sorting);
+ self.entries = tree_view.sorted_entries(
+ self.navigation().view_root,
+ self.sorting,
+ self.scan.is_some(),
+ );
}
}