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

Add location under the file name in list view search results, fixes #338

Browse source
This commit is contained in:
Jeremy Soller 2024-09-17 11:55:54 -06:00
parent 0fe302a524
commit ed2aeadc79
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 55 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/tab.rs
View file

@ -3044,7 +3044,8 @@ impl Tab {
let modified_width = 200.0; let modified_width = 200.0;
let size_width = 100.0; let size_width = 100.0;
let condensed = size.width < (name_width + modified_width + size_width); let condensed = size.width < (name_width + modified_width + size_width);
let icon_size = if condensed { let is_search = matches!(self.location, Location::Search(_, _));
let icon_size = if condensed || is_search {
icon_sizes.list_condensed() icon_sizes.list_condensed()
} else { } else {
icon_sizes.list() icon_sizes.list()
@ -3141,6 +3142,32 @@ impl Tab {
.height(Length::Fixed(row_height as f32)) .height(Length::Fixed(row_height as f32))
.align_items(Alignment::Center) .align_items(Alignment::Center)
.spacing(space_xxs) .spacing(space_xxs)
} else if is_search {
widget::row::with_children(vec![
widget::icon::icon(item.icon_handle_list_condensed.clone())
.content_fit(ContentFit::Contain)
.size(icon_size)
.into(),
widget::column::with_children(vec![
widget::text(item.display_name.clone()).into(),
widget::text::caption(match item.path_opt() {
Some(path) => path.display().to_string(),
None => String::new(),
})
.into(),
])
.width(Length::Fill)
.into(),
widget::text(modified_text.clone())
.width(Length::Fixed(modified_width))
.into(),
widget::text(size_text.clone())
.width(Length::Fixed(size_width))
.into(),
])
.height(Length::Fixed(row_height as f32))
.align_items(Alignment::Center)
.spacing(space_xxs)
} else { } else {
widget::row::with_children(vec![ widget::row::with_children(vec![
widget::icon::icon(item.icon_handle_list.clone()) widget::icon::icon(item.icon_handle_list.clone())
@ -3258,6 +3285,32 @@ impl Tab {
.align_items(Alignment::Center) .align_items(Alignment::Center)
.spacing(space_xxs) .spacing(space_xxs)
.into() .into()
} else if is_search {
widget::row::with_children(vec![
widget::icon::icon(item.icon_handle_list_condensed.clone())
.content_fit(ContentFit::Contain)
.size(icon_size)
.into(),
widget::column::with_children(vec![
widget::text(item.display_name.clone()).into(),
widget::text::caption(match item.path_opt() {
Some(path) => path.display().to_string(),
None => String::new(),
})
.into(),
])
.width(Length::Fill)
.into(),
widget::text(modified_text.clone())
.width(Length::Fixed(modified_width))
.into(),
widget::text(size_text.clone())
.width(Length::Fixed(size_width))
.into(),
])
.align_items(Alignment::Center)
.spacing(space_xxs)
.into()
} else { } else {
widget::row::with_children(vec![ widget::row::with_children(vec![
widget::icon::icon(item.icon_handle_list.clone()) widget::icon::icon(item.icon_handle_list.clone())
@ -3300,7 +3353,7 @@ impl Tab {
} }
//TODO: HACK If we don't reach the bottom of the view, go ahead and add a spacer to do that //TODO: HACK If we don't reach the bottom of the view, go ahead and add a spacer to do that
{ {
let top_deduct = (if condensed { 6 } else { 9 }) * space_xxs; let top_deduct = (if condensed || is_search { 6 } else { 9 }) * space_xxs;
self.item_view_size_opt self.item_view_size_opt
.set(self.size_opt.get().map(|s| Size { .set(self.size_opt.get().map(|s| Size {