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

fix: nav_context_menu must produce one submenu per nav item

Browse source 
The segmented_button widget asserts that context_menu children
count matches model length. The yoda fork was building a single
flat menu for the clicked item instead of iterating over all
nav_model items like upstream, causing an assertion panic on
right-click in the sidebar (trash, folders, etc.).

Align with upstream: iterate self.nav_model.iter() and use
menu::nav_context() instead of menu::items().
This commit is contained in:
Lionel DARNIS 2026-07-25 22:53:11 +02:00
parent 542657b557
commit 30e562c8c2
1 changed files with 87 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

169
src/app.rs
View file

@ -2833,94 +2833,99 @@ 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 entity = self.nav_bar_context_id; let items = self.nav_model.iter().map(|entity| {
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);
let mut items = Vec::with_capacity(7); let mut items = Vec::with_capacity(7);
if location_opt if location_opt
.and_then(Location::path_opt) .and_then(Location::path_opt)
.is_some_and(|x| x.is_file()) .is_some_and(|x| x.is_file())
{ {
items.push(cosmic::widget::menu::Item::Button( items.push(cosmic::widget::menu::Item::Button(
fl!("open"), fl!("open"),
None, None,
NavMenuAction::Open(entity), NavMenuAction::Open(entity),
)); ));
items.push(cosmic::widget::menu::Item::Button( items.push(cosmic::widget::menu::Item::Button(
fl!("menu-open-with"), fl!("menu-open-with"),
None, None,
NavMenuAction::OpenWith(entity), NavMenuAction::OpenWith(entity),
)); ));
} else { } else {
items.push(cosmic::widget::menu::Item::Button( items.push(cosmic::widget::menu::Item::Button(
fl!("open-in-new-tab"), fl!("open-in-new-tab"),
None, None,
NavMenuAction::OpenInNewTab(entity), NavMenuAction::OpenInNewTab(entity),
)); ));
items.push(cosmic::widget::menu::Item::Button( items.push(cosmic::widget::menu::Item::Button(
fl!("open-in-new-window"), fl!("open-in-new-window"),
None, None,
NavMenuAction::OpenInNewWindow(entity), NavMenuAction::OpenInNewWindow(entity),
)); ));
}
if let Some(path) = location_opt.and_then(Location::path_opt) {
let selected_dir = usize::from(path.is_dir());
let action_items: Vec<_> = self
.config
.context_actions
.iter()
.enumerate()
.filter(|(_, action)| action.matches_selection(1, selected_dir))
.map(|(i, action)| {
cosmic::widget::menu::Item::Button(
action.name.clone(),
None,
NavMenuAction::RunContextAction(entity, i),
)
})
.collect();
if !action_items.is_empty() {
items.push(cosmic::widget::menu::Item::Divider);
items.extend(action_items);
} }
} if let Some(path) = location_opt.and_then(Location::path_opt) {
items.push(cosmic::widget::menu::Item::Divider); let selected_dir = usize::from(path.is_dir());
if matches!(location_opt, Some(Location::Path(..))) { let action_items: Vec<_> = self
items.push(cosmic::widget::menu::Item::Button( .config
fl!("show-details"), .context_actions
None, .iter()
NavMenuAction::Preview(entity), .enumerate()
)); .filter(|(_, action)| action.matches_selection(1, selected_dir))
} .map(|(i, action)| {
items.push(cosmic::widget::menu::Item::Divider); cosmic::widget::menu::Item::Button(
if favorite_index_opt.is_some() { action.name.clone(),
items.push(cosmic::widget::menu::Item::Button( None,
fl!("remove-from-sidebar"), NavMenuAction::RunContextAction(entity, i),
None, )
NavMenuAction::RemoveFromSidebar(entity), })
)); .collect();
}
if matches!(location_opt, Some(Location::Recents)) && tab::has_recents() { if !action_items.is_empty() {
items.push(cosmic::widget::menu::Item::Button( items.push(cosmic::widget::menu::Item::Divider);
fl!("clear-recents-history"), items.extend(action_items);
None, }
NavMenuAction::ClearRecents, }
)); items.push(cosmic::widget::menu::Item::Divider);
} if matches!(location_opt, Some(Location::Path(..))) {
items.push(cosmic::widget::menu::Item::Button(
fl!("show-details"),
None,
NavMenuAction::Preview(entity),
));
}
items.push(cosmic::widget::menu::Item::Divider);
if favorite_index_opt.is_some() {
items.push(cosmic::widget::menu::Item::Button(
fl!("remove-from-sidebar"),
None,
NavMenuAction::RemoveFromSidebar(entity),
));
}
if matches!(location_opt, Some(Location::Trash)) && !Trash::is_empty() { if matches!(location_opt, Some(Location::Recents)) && tab::has_recents() {
items.push(cosmic::widget::menu::Item::Button( items.push(cosmic::widget::menu::Item::Button(
fl!("empty-trash"), fl!("clear-recents-history"),
None, None,
NavMenuAction::EmptyTrash, NavMenuAction::ClearRecents,
)); ));
} }
Some(cosmic::widget::menu::items(&HashMap::new(), items)) if matches!(location_opt, Some(Location::Trash)) && !Trash::is_empty() {
items.push(cosmic::widget::menu::Item::Button(
fl!("empty-trash"),
None,
NavMenuAction::EmptyTrash,
));
}
items
});
Some(cosmic::widget::menu::nav_context(
&HashMap::new(),
items.collect(),
))
} }
fn nav_model(&self) -> Option<&segmented_button::SingleSelectModel> { fn nav_model(&self) -> Option<&segmented_button::SingleSelectModel> {