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

QmlDesigner: Fix mouse position on material browser to 3d editor drag

Browse Source 
The mouse position from Edit3DWidget needs to be mapped to Edit3DCanvas
before resolving the 3d position.

Fixes: QDS-7840
Change-Id: I85bc1e9268d6f683382a5431997263429ea13470
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2022-09-30 16:33:53 +03:00
committed by Mahmoud Badri
parent 243e473b4c
commit f2b2f488e2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
View File

@@ -339,6 +339,8 @@ void Edit3DWidget::dragEnterEvent(QDragEnterEvent *dragEnterEvent)
void Edit3DWidget::dropEvent(QDropEvent *dropEvent) void Edit3DWidget::dropEvent(QDropEvent *dropEvent)
{ {
const QPointF pos = m_canvas->mapFrom(this, dropEvent->position());
// handle dropping materials // handle dropping materials
if (dropEvent->mimeData()->hasFormat(Constants::MIME_TYPE_MATERIAL)) { if (dropEvent->mimeData()->hasFormat(Constants::MIME_TYPE_MATERIAL)) {
QByteArray data = dropEvent->mimeData()->data(Constants::MIME_TYPE_MATERIAL); QByteArray data = dropEvent->mimeData()->data(Constants::MIME_TYPE_MATERIAL);
@@ -348,13 +350,13 @@ void Edit3DWidget::dropEvent(QDropEvent *dropEvent)
ModelNode matNode = m_view->modelNodeForInternalId(internalId); ModelNode matNode = m_view->modelNodeForInternalId(internalId);
if (matNode.isValid()) if (matNode.isValid())
m_view->dropMaterial(matNode, dropEvent->position()); m_view->dropMaterial(matNode, pos);
return; return;
} }
// handle dropping bundle materials // handle dropping bundle materials
if (dropEvent->mimeData()->hasFormat(Constants::MIME_TYPE_BUNDLE_MATERIAL)) { if (dropEvent->mimeData()->hasFormat(Constants::MIME_TYPE_BUNDLE_MATERIAL)) {
m_view->dropBundleMaterial(dropEvent->position()); m_view->dropBundleMaterial(pos);
return; return;
} }