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

QmlDesigner: Drag textures from content library to material browser

Browse Source 
Fixes: QDS-8337
Change-Id: Iee42341a18e4acaa0d455aef276df36013ebf21e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Miikka Heikkinen
2022-11-22 17:09:31 +02:00
parent 34b236e7fb
commit fea463bb4a
7 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml
View File

@@ -234,6 +234,22 @@ Item {
width: root.width
caption: qsTr("Textures")
dropEnabled: true
onDropEnter: (drag) => {
drag.accepted = drag.formats[0] === "application/vnd.qtdesignstudio.bundletexture"
highlight = drag.accepted
}
onDropExit: {
highlight = false
}
onDrop: {
highlight = false
rootView.acceptBundleTextureDrop()
}
Grid {
width: scrollView.width
leftPadding: 5
@@ -290,6 +306,21 @@ Item {
enabled: root.enableUiElements
}
}
DropArea {
id: masterDropArea
property int emptyHeight: scrollView.height - materialsSection.height - texturesSection.height
width: root.width
height: emptyHeight > 0 ? emptyHeight : 0
enabled: true
onEntered: (drag) => texturesSection.dropEnter(drag)
onDropped: (drag) => texturesSection.drop(drag)
onExited: texturesSection.dropExit()
}
}
}
}

13
src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp
View File

@@ -8,6 +8,7 @@
#include "contentlibrarywidget.h"
#include "contentlibrarymaterial.h"
#include "contentlibrarymaterialsmodel.h"
#include "contentlibrarytexture.h"
#include "contentlibrarytexturesmodel.h"
#include "modelnodeoperations.h"
#include "nodelistproperty.h"
@@ -49,6 +50,10 @@ WidgetInfo ContentLibraryView::widgetInfo()
[&] (QmlDesigner::ContentLibraryMaterial *mat) {
m_draggedBundleMaterial = mat;
});
connect(m_widget, &ContentLibraryWidget::bundleTextureDragStarted, this,
[&] (QmlDesigner::ContentLibraryTexture *tex) {
m_draggedBundleTexture = tex;
});
connect(m_widget, &ContentLibraryWidget::addTextureRequested, this,
[&] (const QString texPath, ContentLibraryWidget::AddTextureMode mode) {
executeInTransaction("ContentLibraryView::widgetInfo", [&] {
@@ -237,6 +242,14 @@ void ContentLibraryView::customNotification(const AbstractView *view, const QStr
}
m_draggedBundleMaterial = nullptr;
} else if (identifier == "drop_bundle_texture") {
ModelNode matLib = materialLibraryNode();
if (!matLib.isValid())
return;
m_widget->addTexture(m_draggedBundleTexture);
m_draggedBundleTexture = nullptr;
}
}

2
src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.h
View File

@@ -12,6 +12,7 @@
namespace QmlDesigner {
class ContentLibraryMaterial;
class ContentLibraryTexture;
class ContentLibraryWidget;
class Model;
@@ -47,6 +48,7 @@ private:
QList<ModelNode> m_bundleMaterialTargets;
QList<ModelNode> m_selectedModels; // selected 3D model nodes
ContentLibraryMaterial *m_draggedBundleMaterial = nullptr;
ContentLibraryTexture *m_draggedBundleTexture = nullptr;
ModelNode m_activeSceneEnv;
bool m_bundleMaterialAddToSelected = false;
bool m_hasQuick3DImport = false;

11
src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp
View File

@@ -58,11 +58,6 @@ bool ContentLibraryWidget::eventFilter(QObject *obj, QEvent *event)
mimeData->setData(Constants::MIME_TYPE_BUNDLE_MATERIAL, data);
mimeData->removeFormat("text/plain");
if (!m_draggedMaterial) {
m_draggedMaterial = m_materialToDrag;
emit draggedMaterialChanged();
}
emit bundleMaterialDragStarted(m_materialToDrag);
model->startDrag(mimeData, m_materialToDrag->icon().toLocalFile());
m_materialToDrag = nullptr;
@@ -77,6 +72,7 @@ bool ContentLibraryWidget::eventFilter(QObject *obj, QEvent *event)
mimeData->setData(Constants::MIME_TYPE_BUNDLE_TEXTURE, data);
mimeData->removeFormat("text/plain");
emit bundleTextureDragStarted(m_textureToDrag);
model->startDrag(mimeData, m_textureToDrag->icon().toLocalFile());
m_textureToDrag = nullptr;
}
@@ -84,11 +80,6 @@ bool ContentLibraryWidget::eventFilter(QObject *obj, QEvent *event)
} else if (event->type() == QMouseEvent::MouseButtonRelease) {
m_materialToDrag = nullptr;
m_textureToDrag = nullptr;
if (m_draggedMaterial) {
m_draggedMaterial = nullptr;
emit draggedMaterialChanged();
}
}
return QObject::eventFilter(obj, event);

3
src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.h
View File

@@ -49,7 +49,7 @@ public:
signals:
void bundleMaterialDragStarted(QmlDesigner::ContentLibraryMaterial *bundleMat);
void draggedMaterialChanged();
void bundleTextureDragStarted(QmlDesigner::ContentLibraryTexture *bundleTex);
void addTextureRequested(const QString texPath, QmlDesigner::ContentLibraryWidget::AddTextureMode mode);
protected:
@@ -70,7 +70,6 @@ private:
QString m_filterText;
ContentLibraryMaterial *m_materialToDrag = nullptr;
ContentLibraryMaterial *m_draggedMaterial = nullptr;
ContentLibraryTexture *m_textureToDrag = nullptr;
QPoint m_dragStartPoint;
};

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

@@ -257,6 +257,11 @@ void MaterialBrowserWidget::acceptBundleMaterialDrop()
m_materialBrowserView->emitCustomNotification("drop_bundle_material", {}, {}); // To ContentLibraryView
}
void MaterialBrowserWidget::acceptBundleTextureDrop()
{
m_materialBrowserView->emitCustomNotification("drop_bundle_texture", {}, {}); // To ContentLibraryView
}
QString MaterialBrowserWidget::qmlSourcesPath()
{
#ifdef SHARE_QML_PATH

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

@@ -52,6 +52,7 @@ public:
Q_INVOKABLE void startDragMaterial(int index, const QPointF &mousePos);
Q_INVOKABLE void startDragTexture(int index, const QPointF &mousePos);
Q_INVOKABLE void acceptBundleMaterialDrop();
Q_INVOKABLE void acceptBundleTextureDrop();
QQuickWidget *quickWidget() const;