bobwen-dev/hunter
1
0
Fork 0
mirror of https://github.com/bobwen-dev/hunter synced 2025-04-12 00:55:41 +02:00
Code Issues Releases Wiki Activity

fix selection when toggling display of hidden files

Browse Source
This commit is contained in:
rabite0 2020-03-02 22:59:18 +01:00
parent e4850e38b6
commit 1ddb7a1593
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/listview.rs
View File

@ -61,8 +61,6 @@ impl Acting for ListView<Files> {
fn do_action(&mut self, action: &Self::Action) -> HResult<()> { fn do_action(&mut self, action: &Self::Action) -> HResult<()> {
use FileListAction::*; use FileListAction::*;
let pos = self.get_selection();
match action { match action {
Search => self.search_file()?, Search => self.search_file()?,
SearchNext => self.search_next()?, SearchNext => self.search_next()?,
@ -81,10 +79,6 @@ impl Acting for ListView<Files> {
ToggleDirsFirst => self.toggle_dirs_first(), ToggleDirsFirst => self.toggle_dirs_first(),
} }
if pos != self.get_selection() {
self.update_selected_file(pos);
}
Ok(()) Ok(())
} }
} }
@ -528,7 +522,6 @@ impl ListView<Files>
let file = self.clone_selected_file(); let file = self.clone_selected_file();
self.content.toggle_hidden(); self.content.toggle_hidden();
self.select_file(&file); self.select_file(&file);
self.refresh().log();
self.core.show_status(&format!("Showing hidden files: {}", self.core.show_status(&format!("Showing hidden files: {}",
self.content.show_hidden)).log(); self.content.show_hidden)).log();
} }
@ -546,12 +539,14 @@ impl ListView<Files>
fn multi_select_file(&mut self) { fn multi_select_file(&mut self) {
self.selected_file_mut().toggle_selection(); self.selected_file_mut().toggle_selection();
// Create mutable clone to render change
let mut file = self.clone_selected_file();
file.toggle_selection();
if !self.content.filter_selected { if !self.content.filter_selected {
let oldpos = self.get_selection();
self.move_down(); self.move_down();
let newpos = self.get_selection();
if newpos > oldpos {
self.update_selected_file(oldpos);
}
} else { } else {
if self.content.filter_selected && self.content.len() == 0 { if self.content.filter_selected && self.content.len() == 0 {
self.content.toggle_filter_selected(); self.content.toggle_filter_selected();
@ -913,6 +908,7 @@ impl ListView<Files>
let file = self.clone_selected_file(); let file = self.clone_selected_file();
if let Ok(Some(_)) = self.content.get_refresh() { if let Ok(Some(_)) = self.content.get_refresh() {
// Positions might change when files are added/removed/renamed
self.select_file(&file); self.select_file(&file);
self.content.run_jobs(self.core.get_sender()); self.content.run_jobs(self.core.get_sender());
} }