forked from qt-creator/qt-creator
QmlDesigner: Fix selection issues in navigator and 3d edit view
Fixed multiple issues with showing correct selection in navigator and 3d edit view: - Dragging items from item library selects only that item, regardless if drag was done to 3d edit view or navigator - Selection is shown correctly after reparenting items, including multiselection reparenting - Adding a new item to the active scene now shows selection box correctly for that item Change-Id: I5156ca4c22e606c41e1e346ea5c32c3d70d89f5e Fixes: QDS-1577 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -35,6 +35,7 @@
|
||||
#include <QtQuick3D/qquick3dobject.h>
|
||||
#include <QtQuick/qquickwindow.h>
|
||||
#include <QtCore/qvector.h>
|
||||
#include <QtCore/qtimer.h>
|
||||
|
||||
#include <limits>
|
||||
|
||||
@@ -162,6 +163,12 @@ QSSGRenderGraphObject *SelectionBoxGeometry::updateSpatialNode(QSSGRenderGraphOb
|
||||
rootRN->localTransform = m;
|
||||
rootRN->markDirty(QSSGRenderNode::TransformDirtyFlag::TransformNotDirty);
|
||||
rootRN->calculateGlobalVariables();
|
||||
m_asyncUpdatePending = false;
|
||||
} else if (!m_asyncUpdatePending) {
|
||||
m_asyncUpdatePending = true;
|
||||
// A necessary spatial node doesn't yet exist. Defer selection box creation one frame.
|
||||
QTimer::singleShot(0, this, &SelectionBoxGeometry::update);
|
||||
return node;
|
||||
}
|
||||
getBounds(m_targetNode, vertexData, indexData, minBounds, maxBounds);
|
||||
appendVertexData(QMatrix4x4(), vertexData, indexData, minBounds, maxBounds);
|
||||
|
||||
@@ -81,6 +81,7 @@ private:
|
||||
bool m_isEmpty = true;
|
||||
QVector<QMetaObject::Connection> m_connections;
|
||||
QSSGBounds3 m_bounds;
|
||||
bool m_asyncUpdatePending = false;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -925,7 +925,8 @@ void Qt5InformationNodeInstanceServer::reparentInstances(const ReparentInstances
|
||||
if (m_editView3DRootItem)
|
||||
resolveSceneRoots();
|
||||
|
||||
render3DEditView();
|
||||
// Make sure selection is in sync after all reparentings are done
|
||||
m_selectionChangeTimer.start(0);
|
||||
}
|
||||
|
||||
void Qt5InformationNodeInstanceServer::clearScene(const ClearSceneCommand &command)
|
||||
@@ -1085,7 +1086,7 @@ void Qt5InformationNodeInstanceServer::changeSelection(const ChangeSelectionComm
|
||||
Q_ARG(QVariant, QVariant::fromValue(selectedObjs)));
|
||||
}
|
||||
|
||||
render3DEditView();
|
||||
render3DEditView(2);
|
||||
}
|
||||
|
||||
void Qt5InformationNodeInstanceServer::changePropertyValues(const ChangeValuesCommand &command)
|
||||
|
||||
Reference in New Issue
Block a user