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

Use trash-rs' is_empty more

Browse source 
Fixes two instances where enumerating trash items isn't needed.
This commit is contained in:
Josh Megnauth 2025-07-22 02:52:44 -04:00 • committed by Jeremy Soller
parent 3390ef7ea8
commit 35a9bd5347
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/app.rs
View file

@ -2262,14 +2262,14 @@ impl Application for App {
NavMenuAction::RemoveFromSidebar(entity), NavMenuAction::RemoveFromSidebar(entity),
)); ));
} }
if matches!(location_opt, Some(Location::Trash)) { if matches!(location_opt, Some(Location::Trash))
if tab::trash_entries() > 0 { && !trash::os_limited::is_empty().unwrap_or(true)
items.push(cosmic::widget::menu::Item::Button( {
fl!("empty-trash"), items.push(cosmic::widget::menu::Item::Button(
None, fl!("empty-trash"),
NavMenuAction::EmptyTrash, None,
)); NavMenuAction::EmptyTrash,
} ));
} }
Some(cosmic::widget::menu::items(&HashMap::new(), items)) Some(cosmic::widget::menu::items(&HashMap::new(), items))

2
src/menu.rs
View file

@ -160,7 +160,7 @@ pub fn context_menu<'a>(
) => { ) => {
if selected_trash_only { if selected_trash_only {
children.push(menu_item(fl!("open"), Action::Open).into()); children.push(menu_item(fl!("open"), Action::Open).into());
if tab::trash_entries() > 0 { if !trash::os_limited::is_empty().unwrap_or(true) {
children.push(menu_item(fl!("empty-trash"), Action::EmptyTrash).into()); children.push(menu_item(fl!("empty-trash"), Action::EmptyTrash).into());
} }
} else if let Some(entry) = selected_desktop_entry { } else if let Some(entry) = selected_desktop_entry {