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

fix: Trash icons should show the trash menu

Browse source 
Closes: #593

Trash bins currently show an incorrect menu with invalid actions such as
opening the bin in a terminal. The menu also doesn't have an entry for
emptying the trash.
This commit is contained in:
Josh Megnauth 2024-10-14 03:04:03 -04:00
parent 3767a61f2a
commit 0548883c13
No known key found for this signature in database
GPG key ID: 70813183462EFAD3
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/menu.rs
View file

@ -89,6 +89,7 @@ pub fn context_menu<'a>(
let mut selected_dir = 0;
let mut selected = 0;
let mut selected_trash_only = false;
let mut selected_types: Vec<Mime> = vec![];
tab.items_opt().map(|items| {
for item in items.iter() {
@ -97,12 +98,16 @@ pub fn context_menu<'a>(
if item.metadata.is_dir() {
selected_dir += 1;
}
if item.location_opt == Some(Location::Trash) {
selected_trash_only = true;
}
selected_types.push(item.mime.clone());
}
}
});
selected_types.sort_unstable();
selected_types.dedup();
selected_trash_only = selected_trash_only && selected == 1;
let mut children: Vec<Element<_>> = Vec::new();
match (&tab.mode, &tab.location) {
@ -110,7 +115,12 @@ pub fn context_menu<'a>(
tab::Mode::App | tab::Mode::Desktop,
Location::Desktop(..) | Location::Path(..) | Location::Search(..) | Location::Recents,
) => {
if selected > 0 {
if selected_trash_only {
children.push(menu_item(fl!("open"), Action::Open).into());
if tab::trash_entries() > 0 {
children.push(menu_item(fl!("empty-trash"), Action::EmptyTrash).into());
}
} else if selected > 0 {
if selected_dir == 1 && selected == 1 || selected_dir == 0 {
children.push(menu_item(fl!("open"), Action::Open).into());
}