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

Gui: Respect parent container selectability in nested selections

Browse Source
This commit is contained in:
tetektoza
2025-12-26 13:48:51 +01:00
parent 17543ea69e
commit b44d75454f
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Gui/Selection/SoFCUnifiedSelection.cpp
View File

@@ -454,25 +454,32 @@ void SoFCUnifiedSelection::doAction(SoAction* action)
// selection changes inside the 3d view are handled in handleEvent()
App::Document* doc = App::GetApplication().getDocument(selectionAction->SelChange.pDocName);
App::DocumentObject* obj = doc->getObject(selectionAction->SelChange.pObjectName);
ViewProvider*vp = Application::Instance->getViewProvider(obj);
// check if the actual subobject being selected is selectable
ViewProvider* vp = Application::Instance->getViewProvider(obj);
// check if the subobject and all its parent containers are selectable
bool isSelectable = false;
if (vp) {
if (selectionAction->SelChange.pSubName && selectionAction->SelChange.pSubName[0]) {
if (auto subObj = obj->getSubObject(selectionAction->SelChange.pSubName)) {
auto subVp = Application::Instance->getViewProvider(subObj);
isSelectable = subVp ? subVp->isSelectable() : false;
} else {
isSelectable = vp->isSelectable();
// get the entire object hierarchy from root to leaf
auto objList = obj->getSubObjectList(selectionAction->SelChange.pSubName);
isSelectable = true;
for (auto* checkObj : objList) {
if (auto checkVp = Application::Instance->getViewProvider(checkObj)) {
if (!checkVp->isSelectable()) {
isSelectable = false;
break;
}
}
}
} else {
}
else {
isSelectable = vp->isSelectable();
}
}
if (vp && (useNewSelection.getValue() || vp->useNewSelectionModel()) && isSelectable) {
SoDetail *detail = nullptr;
SoDetail* detail = nullptr;
detailPath->truncate(0);
auto subName = selectionAction->SelChange.pSubName;
App::ElementNamePair elementName;