leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #386 from l-const/master

Browse source 
Consider clearing the search filtering when searchSubmit and the input is empty.
This commit is contained in:
Jeremy Soller 2024-08-15 07:54:16 -06:00 • committed by GitHub
commit bd233d89ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/app.rs
View file

@ -443,8 +443,14 @@ impl App {
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) {
match &tab.location { match &tab.location {
Location::Path(path) | Location::Search(path, ..) => { Location::Path(path) | Location::Search(path, ..) => {
let location = if !self.search_input.is_empty() {
Location::Search(path.clone(), self.search_input.clone())
}
else {
Location::Path(path.clone())
};
tab.change_location( tab.change_location(
&Location::Search(path.clone(), self.search_input.clone()), &location,
None, None,
); );
title_location_opt = Some((tab.title(), tab.location.clone())); title_location_opt = Some((tab.title(), tab.location.clone()));
@ -1772,6 +1778,11 @@ impl Application for App {
Message::SearchSubmit => { Message::SearchSubmit => {
if !self.search_input.is_empty() { if !self.search_input.is_empty() {
return self.search(); return self.search();
} else {
// rescan the tab to get the contents back
// and exit search
self.search_active = false;
return self.search();
} }
} }
Message::SystemThemeModeChange(_theme_mode) => { Message::SystemThemeModeChange(_theme_mode) => {