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

QmlDesigner: Allow drag-n-drop a bundle material to materials section

Browse Source 
Fixes: QDS-8041
Change-Id: I848f636f41c58e11c719517f4073243a76e293b6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2022-10-20 17:42:46 +03:00
parent e238c8f0a4
commit 70f532c43f
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,6 +187,21 @@ Item {
width: root.width
caption: qsTr("Materials")
hideHeader: !materialBrowserBundleModel.matBundleExists
dropEnabled: true
onDropEnter: (drag) => {
drag.accepted = rootView.draggedBundleMaterial
userMaterialsSection.highlight = rootView.draggedBundleMaterial
}
onDropExit: {
userMaterialsSection.highlight = false
}
onDrop: {
userMaterialsSection.highlight = false
materialBrowserBundleModel.addToProject(rootView.draggedBundleMaterial)
}
Grid {
id: grid

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

@@ -139,14 +139,24 @@ bool MaterialBrowserWidget::eventFilter(QObject *obj, QEvent *event)
mimeData->setData(Constants::MIME_TYPE_BUNDLE_MATERIAL, data);
mimeData->removeFormat("text/plain");
if (!m_draggedBundleMaterial) {
m_draggedBundleMaterial = m_bundleMaterialToDrag;
emit draggedBundleMaterialChanged();
}
emit bundleMaterialDragStarted(m_bundleMaterialToDrag);
model->startDrag(mimeData, m_bundleMaterialToDrag->icon().toLocalFile());
m_bundleMaterialToDrag = {};
m_bundleMaterialToDrag = nullptr;
}
}
} else if (event->type() == QMouseEvent::MouseButtonRelease) {
m_materialToDrag = {};
m_bundleMaterialToDrag = {};
m_bundleMaterialToDrag = nullptr;
if (m_draggedBundleMaterial) {
m_draggedBundleMaterial = nullptr;
emit draggedBundleMaterialChanged();
}
}
return QObject::eventFilter(obj, event);

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

@@ -58,6 +58,7 @@ class PreviewImageProvider;
class MaterialBrowserWidget : public QFrame
{
Q_OBJECT
Q_PROPERTY(BundleMaterial *draggedBundleMaterial MEMBER m_draggedBundleMaterial NOTIFY draggedBundleMaterialChanged)
public:
MaterialBrowserWidget(MaterialBrowserView *view);
@@ -81,6 +82,7 @@ public:
signals:
void bundleMaterialDragStarted(QmlDesigner::BundleMaterial *bundleMat);
void draggedBundleMaterialChanged();
protected:
bool eventFilter(QObject *obj, QEvent *event) override;
@@ -102,6 +104,7 @@ private:
ModelNode m_materialToDrag;
BundleMaterial *m_bundleMaterialToDrag = nullptr;
BundleMaterial *m_draggedBundleMaterial = nullptr;
QPoint m_dragStartPoint;
};