feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Show selection and gizmo for scene root light/camera

Browse Source 
Change-Id: Ib650a5e331cf2936ef20a47abec5086bb08f06d2
Fixes: QDS-1857
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2020-03-30 15:00:14 +03:00
parent df1152dd95
commit 9a2eedf196
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
View File

@@ -1045,24 +1045,26 @@ void Qt5InformationNodeInstanceServer::changeSelection(const ChangeSelectionComm
if (firstSceneRoot && sceneRoot == firstSceneRoot && instance.isSubclassOf("QQuick3DNode"))
object = instance.internalObject();
auto instanceIsModelOrComponent = [&]() -> bool {
bool retval = instance.isSubclassOf("QQuick3DModel");
auto isSelectableAsRoot = [&]() -> bool {
#ifdef QUICK3D_MODULE
if (!retval) {
// Node is a component if it has node children that have no instances
auto node = qobject_cast<QQuick3DNode *>(object);
if (node) {
const auto childItems = node->childItems();
for (const auto &childItem : childItems) {
if (qobject_cast<QQuick3DNode *>(childItem) && !hasInstanceForObject(childItem))
return true;
}
if (qobject_cast<QQuick3DModel *>(object)
|| qobject_cast<QQuick3DCamera *>(object)
|| qobject_cast<QQuick3DAbstractLight *>(object)) {
return true;
}
// Node is a component if it has node children that have no instances
auto node = qobject_cast<QQuick3DNode *>(object);
if (node) {
const auto childItems = node->childItems();
for (const auto &childItem : childItems) {
if (qobject_cast<QQuick3DNode *>(childItem) && !hasInstanceForObject(childItem))
return true;
}
}
#endif
return retval;
return false;
};
if (object && (firstSceneRoot != object || instanceIsModelOrComponent()))
if (object && (firstSceneRoot != object || isSelectableAsRoot()))
selectedObjs << objectToVariant(object);
}
}