diff options
author | rabite <rabite@posteo.de> | 2020-02-07 21:49:29 +0100 |
---|---|---|
committer | rabite <rabite@posteo.de> | 2020-02-07 21:49:29 +0100 |
commit | 0f7be9e9290624b8ce9ebcfaa960065353483306 (patch) | |
tree | e31f6c072a6c9fe36df9f2f21b50b9f35a840ca2 | |
parent | 13b927d07e529a28e55062f09b7219bd1098929e (diff) |
fix calculation of the number of shown files in a directory
-rw-r--r-- | src/file_browser.rs | 22 | ||||
-rw-r--r-- | src/files.rs | 12 |
2 files changed, 20 insertions, 14 deletions
diff --git a/src/file_browser.rs b/src/file_browser.rs index 0d31be4..1647090 100644 --- a/src/file_browser.rs +++ b/src/file_browser.rs @@ -197,10 +197,13 @@ impl Tabbable for TabView<FileBrowser> { tab.left_async_widget_mut().map(|async_w| { async_w.widget.on_ready(move |mut w, _| { w.as_mut() - .map(|mut w| { - w.content.show_hidden = show_hidden; - w.refresh().log(); - }).ok(); + .map(|mut w| { + if w.content.show_hidden != show_hidden { + w.content.show_hidden = show_hidden; + w.content.recalculate_len(); + w.refresh().log(); + } + }).ok(); Ok(()) }).log(); }).log(); @@ -208,10 +211,13 @@ impl Tabbable for TabView<FileBrowser> { tab.main_async_widget_mut().map(|async_w| { async_w.widget.on_ready(move |mut w, _| { w.as_mut() - .map(|mut w| { - w.content.show_hidden = show_hidden; - w.refresh().log(); - }).ok(); + .map(|mut w| { + if w.content.show_hidden != show_hidden { + w.content.show_hidden = show_hidden; + w.content.recalculate_len(); + w.refresh().log(); + } + }).ok(); Ok(()) }).log() }).log(); diff --git a/src/files.rs b/src/files.rs index 78741c1..6e800dd 100644 --- a/src/files.rs +++ b/src/files.rs @@ -288,7 +288,7 @@ impl Default for Files { sort: SortBy::Name, dirs_first: true, reverse: false, - show_hidden: true, + show_hidden: false, filter: None, filter_selected: false, dirty: DirtyBit::new(), @@ -350,24 +350,24 @@ impl Files { })?; } - let len = files.len(); - - let files = Files { + let mut files = Files { directory: File::new_from_path(&path, None)?, files: files, - len: len, + len: 0, pending_events: Arc::new(RwLock::new(vec![])), refresh: None, meta_upto: None, sort: SortBy::Name, dirs_first: true, reverse: false, - show_hidden: true, + show_hidden: false, filter: None, filter_selected: false, dirty: dirty, }; + files.recalculate_len(); + Ok(files) } |