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

QmlDesigner: Implement dragging a bundle texture to a material

Browse Source 
Fixes: QDS-9375
Change-Id: Id73e54341e12ec023bb0b55ddffdb7f6b89e2267
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2023-03-07 18:48:12 +02:00
parent c3e5f3e83c
commit 230c1331ee
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialItem.qml
View File

@@ -48,6 +48,7 @@ Rectangle {
onEntered: (drag) => { onEntered: (drag) => {
drag.accepted = drag.formats[0] === "application/vnd.qtdesignstudio.texture" drag.accepted = drag.formats[0] === "application/vnd.qtdesignstudio.texture"
|| drag.formats[0] === "application/vnd.qtdesignstudio.bundletexture"
|| (drag.formats[0] === "application/vnd.qtdesignstudio.assets" || (drag.formats[0] === "application/vnd.qtdesignstudio.assets"
&& rootView.hasAcceptableAssets(drag.urls)) && rootView.hasAcceptableAssets(drag.urls))
} }
@@ -57,6 +58,8 @@ Rectangle {
if (drag.formats[0] === "application/vnd.qtdesignstudio.texture") if (drag.formats[0] === "application/vnd.qtdesignstudio.texture")
rootView.acceptTextureDropOnMaterial(index, drag.getDataAsString(drag.keys[0])) rootView.acceptTextureDropOnMaterial(index, drag.getDataAsString(drag.keys[0]))
else if (drag.formats[0] === "application/vnd.qtdesignstudio.bundletexture")
rootView.acceptBundleTextureDropOnMaterial(index, drag.urls[0])
else if (drag.formats[0] === "application/vnd.qtdesignstudio.assets") else if (drag.formats[0] === "application/vnd.qtdesignstudio.assets")
rootView.acceptAssetsDropOnMaterial(index, drag.urls) rootView.acceptAssetsDropOnMaterial(index, drag.urls)
} }

18
src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp
View File

@@ -288,6 +288,24 @@ void MaterialBrowserWidget::acceptBundleTextureDrop()
m_materialBrowserView->model()->endDrag(); m_materialBrowserView->model()->endDrag();
} }
void MaterialBrowserWidget::acceptBundleTextureDropOnMaterial(int matIndex, const QUrl &bundleTexPath)
{
ModelNode mat = m_materialBrowserModel->materialAt(matIndex);
QTC_ASSERT(mat.isValid(), return);
auto *creator = new CreateTexture(m_materialBrowserView, true);
m_materialBrowserView->executeInTransaction(__FUNCTION__, [&] {
ModelNode tex = creator->execute(bundleTexPath.toLocalFile());
QTC_ASSERT(tex.isValid(), return);
m_materialBrowserModel->selectMaterial(matIndex);
m_materialBrowserView->applyTextureToMaterial({mat}, tex);
});
creator->deleteLater();
}
void MaterialBrowserWidget::acceptAssetsDrop(const QList<QUrl> &urls) void MaterialBrowserWidget::acceptAssetsDrop(const QList<QUrl> &urls)
{ {
QStringList assetPaths = Utils::transform(urls, [](const QUrl &url) { return url.toLocalFile(); }); QStringList assetPaths = Utils::transform(urls, [](const QUrl &url) { return url.toLocalFile(); });

1
src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.h
View File

@@ -60,6 +60,7 @@ public:
Q_INVOKABLE void acceptBundleMaterialDrop(); Q_INVOKABLE void acceptBundleMaterialDrop();
Q_INVOKABLE bool hasAcceptableAssets(const QList<QUrl> &urls); Q_INVOKABLE bool hasAcceptableAssets(const QList<QUrl> &urls);
Q_INVOKABLE void acceptBundleTextureDrop(); Q_INVOKABLE void acceptBundleTextureDrop();
Q_INVOKABLE void acceptBundleTextureDropOnMaterial(int matIndex, const QUrl &bundleTexPath);
Q_INVOKABLE void acceptAssetsDrop(const QList<QUrl> &urls); Q_INVOKABLE void acceptAssetsDrop(const QList<QUrl> &urls);
Q_INVOKABLE void acceptAssetsDropOnMaterial(int matIndex, const QList<QUrl> &urls); Q_INVOKABLE void acceptAssetsDropOnMaterial(int matIndex, const QList<QUrl> &urls);
Q_INVOKABLE void acceptTextureDropOnMaterial(int matIndex, const QString &texId); Q_INVOKABLE void acceptTextureDropOnMaterial(int matIndex, const QString &texId);