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

QmlDesigner: Fix dragging materials to Model in navigator

Browse Source 
Fixes: QDS-8537
Change-Id: I0d63676e9e7fc39166c1cd32a231547161b2f0a5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2022-12-13 17:39:53 +02:00
parent c476a1b807
commit bf4a94d619
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
View File

@@ -797,10 +797,7 @@ void NavigatorTreeModel::handleMaterialDrop(const QMimeData *mimeData, int rowNu
if (!targetNode.metaInfo().isQtQuick3DModel()) if (!targetNode.metaInfo().isQtQuick3DModel())
return; return;
QByteArray data = mimeData->data(Constants::MIME_TYPE_MATERIAL); qint32 internalId = mimeData->data(Constants::MIME_TYPE_MATERIAL).toInt();
QDataStream stream(data);
qint32 internalId;
stream >> internalId;
ModelNode matNode = m_view->modelNodeForInternalId(internalId); ModelNode matNode = m_view->modelNodeForInternalId(internalId);
m_view->executeInTransaction(__FUNCTION__, [&] { m_view->executeInTransaction(__FUNCTION__, [&] {

5
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
View File

@@ -253,10 +253,7 @@ void NavigatorView::dragStarted(QMimeData *mimeData)
m_widget->setDragType(itemLibraryEntry.typeName()); m_widget->setDragType(itemLibraryEntry.typeName());
m_widget->update(); m_widget->update();
} else if (mimeData->hasFormat(Constants::MIME_TYPE_MATERIAL)) { } else if (mimeData->hasFormat(Constants::MIME_TYPE_MATERIAL)) {
QByteArray data = mimeData->data(Constants::MIME_TYPE_MATERIAL); qint32 internalId = mimeData->data(Constants::MIME_TYPE_MATERIAL).toInt();
QDataStream stream(data);
qint32 internalId;
stream >> internalId;
ModelNode matNode = modelNodeForInternalId(internalId); ModelNode matNode = modelNodeForInternalId(internalId);
m_widget->setDragType(matNode.metaInfo().typeName()); m_widget->setDragType(matNode.metaInfo().typeName());