kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #25548 from Rexbas/fix-gesture-contextmenu-segfault

Browse Source 
Gui: Fix Gesture style context menu segfault
This commit is contained in:
Chris Hennes
2025-11-24 11:13:14 -06:00
committed by GitHub
parent eb38196fd2 2979c387ab
commit 8f07f4e1b9
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Gui/Navigation/NavigationStyle.cpp
View File

@@ -2149,22 +2149,28 @@ void NavigationStyle::openPopupMenu(const SbVec2s& position)
contextMenu->insertSeparator(posAction);
}
QAction* selectedAction = contextMenu->exec(QCursor::pos());
// handle navigation style change if user selected a navigation style option
if (selectedAction && isNavigationStyleAction(selectedAction, navMenuGroup)) {
applyNavigationStyleChange(selectedAction);
rightClickPosition.reset();
return;
}
if (pickAction && selectedAction == pickAction) {
// Execute the Clarify Selection command at this position
auto cmd = Application::Instance->commandManager().getCommandByName("Std_ClarifySelection");
if (cmd && cmd->isActive()) {
cmd->invoke(0); // required placeholder value - we don't use group command
auto navigationFunction = [this, navMenuGroup](QAction* selectedAction) {
// handle navigation style change if user selected a navigation style option
if (isNavigationStyleAction(selectedAction, navMenuGroup)) {
applyNavigationStyleChange(selectedAction);
rightClickPosition.reset();
}
}
};
auto clarifyFunction = [pickAction](QAction* selectedAction) {
if (selectedAction == pickAction) {
// Execute the Clarify Selection command at this position
auto cmd = Application::Instance->commandManager().getCommandByName("Std_ClarifySelection");
if (cmd && cmd->isActive()) {
cmd->invoke(0); // required placeholder value - we don't use group command
}
}
};
QObject::connect(contextMenu, &QMenu::triggered, navigationFunction);
QObject::connect(contextMenu, &QMenu::triggered, clarifyFunction);
contextMenu->popup(QCursor::pos());
rightClickPosition.reset();
}