diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-08-23 15:19:56 +0300 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2022-08-25 09:55:32 +0000 |
commit | 8656bafbd4051bb75fea398f68331c73d9d67cfb (patch) | |
tree | 329a67afe38e1a1baf40f92ed946b26999b5b465 /src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | |
parent | f6e8b5f753e05f210979987dc3e9092cefb8b958 (diff) | |
download | qt-creator-8656bafbd4051bb75fea398f68331c73d9d67cfb.tar.gz |
QmlDesigner: Add delete action to 3D Editor's context menu
This entails selecting a model upon right-clicking if it is not selected.
Also fixed a memory leak and small tweaks.
Fixes: QDS-7401
Change-Id: I592acb3fff30ecc3236f3cf2fbe126de4fb389dc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/components/edit3d/edit3dview.cpp')
-rw-r--r-- | src/plugins/qmldesigner/components/edit3d/edit3dview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index fb844b1c85..5a598dbd0e 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -249,6 +249,10 @@ void Edit3DView::customNotification(const AbstractView *view, const QString &ide void Edit3DView::modelAtPosReady(const ModelNode &modelNode) { if (m_modelAtPosReqType == ModelAtPosReqType::ContextMenu) { + // Make sure right-clicked item is selected. Due to a bug in puppet side right-clicking an item + // while the context-menu is shown doesn't select the item. + if (modelNode.isValid() && !modelNode.isSelected()) + setSelectedModelNode(modelNode); m_edit3DWidget->showContextMenu(m_contextMenuPos, modelNode); } else if (m_modelAtPosReqType == ModelAtPosReqType::MaterialDrop) { if (m_droppedMaterial.isValid() && modelNode.isValid()) { |