From 1641ad625eed284a43ccf9b8ea2f9cb9649a095d Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Thu, 24 Oct 2019 12:48:27 +0300 Subject: [PATCH] Deselect all objects when clicking an empty point in the 3D edit view Task-number: QDS-1124 Change-Id: I5a9ed39a69c467de27dd7c4564d53b7bf033dd92 Reviewed-by: Miikka Heikkinen Reviewed-by: Thomas Hartmann --- share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml | 3 +-- .../instances/qt5informationnodeinstanceserver.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml index f3c7dc3429e..b9849d484c8 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml @@ -54,8 +54,7 @@ Window { onTapped: { var pickResult = editView.pick(eventPoint.scenePosition.x, eventPoint.scenePosition.y); - if (pickResult.objectHit) - viewWindow.objectClicked(pickResult.objectHit); + viewWindow.objectClicked(pickResult.objectHit); } } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index ff4bb7e84dd..685136cb2d4 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -101,9 +101,10 @@ QObject *Qt5InformationNodeInstanceServer::createEditView3D(QQmlEngine *engine) return window; } -void Qt5InformationNodeInstanceServer::objectClicked(const QVariant &object) { - QObject *item = qobject_cast(object.value()); - selectInstance(instanceForObject(item)); +// an object is clicked in the 3D edit view +void Qt5InformationNodeInstanceServer::objectClicked(const QVariant &object) +{ + selectInstance(instanceForObject(object.value())); } Qt5InformationNodeInstanceServer::Qt5InformationNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient) :