Compare commits

..

No commits in common. "9e0c2726efb37b4116e782b51d5e637f114271a2" and "542657b557cbbf8e051cbead3a9bc24b86a17e5f" have entirely different histories.

2 changed files with 81 additions and 92 deletions

View file

@ -2833,7 +2833,7 @@ impl Application for App {
fn nav_context_menu( fn nav_context_menu(
&self, &self,
) -> Option<Vec<widget::menu::Tree<cosmic::Action<Self::Message>>>> { ) -> Option<Vec<widget::menu::Tree<cosmic::Action<Self::Message>>>> {
let items = self.nav_model.iter().map(|entity| { let entity = self.nav_bar_context_id;
let favorite_index_opt = self.nav_model.data::<FavoriteIndex>(entity); let favorite_index_opt = self.nav_model.data::<FavoriteIndex>(entity);
let location_opt = self.nav_model.data::<Location>(entity); let location_opt = self.nav_model.data::<Location>(entity);
@ -2919,13 +2919,8 @@ impl Application for App {
NavMenuAction::EmptyTrash, NavMenuAction::EmptyTrash,
)); ));
} }
items
});
Some(cosmic::widget::menu::nav_context( Some(cosmic::widget::menu::items(&HashMap::new(), items))
&HashMap::new(),
items.collect(),
))
} }
fn nav_model(&self) -> Option<&segmented_button::SingleSelectModel> { fn nav_model(&self) -> Option<&segmented_button::SingleSelectModel> {

View file

@ -418,12 +418,6 @@ pub fn context_menu<'a>(
if tab.mode.multiple() { if tab.mode.multiple() {
children.push(menu_item(fl!("select-all"), Action::SelectAll).into()); children.push(menu_item(fl!("select-all"), Action::SelectAll).into());
} }
if !Trash::is_empty() {
if !children.is_empty() {
children.push(divider::horizontal::light().into());
}
children.push(menu_item(fl!("empty-trash"), Action::EmptyTrash).into());
}
if !children.is_empty() { if !children.is_empty() {
children.push(divider::horizontal::light().into()); children.push(divider::horizontal::light().into());
} }