Merge pull request #1270 from jasonrhansen/location-context-menu-fix
Fix location context menu
This commit is contained in:
commit
5a326b6ff1
2 changed files with 13 additions and 7 deletions
12
src/app.rs
12
src/app.rs
|
|
@ -4364,13 +4364,19 @@ impl Application for App {
|
|||
}
|
||||
}
|
||||
Message::NavBarContext(entity) => {
|
||||
// Close location editing if enabled
|
||||
self.nav_bar_context_id = entity;
|
||||
|
||||
let tab_entity = self.tab_model.active();
|
||||
if let Some(tab) = self.tab_model.data_mut::<Tab>(tab_entity) {
|
||||
// Close location editing if enabled
|
||||
tab.edit_location = None;
|
||||
// Close other context menus.
|
||||
tab.location_context_menu_index = None;
|
||||
return Task::done(cosmic::Action::App(Message::TabMessage(
|
||||
Some(tab_entity),
|
||||
tab::Message::ContextMenu(None, None),
|
||||
)));
|
||||
}
|
||||
|
||||
self.nav_bar_context_id = entity;
|
||||
}
|
||||
Message::NavMenuAction(action) => match action {
|
||||
NavMenuAction::Open(entity) => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue