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

QmlDesigner: Add basic drag-n-drop support to textures

Browse Source 
Dropping textures to different views to be handled separately.

Change-Id: I1e0ac5681e5e1b3dca8bdaf6819a6b699f629e79
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2022-11-07 16:49:17 +02:00
parent d5a7f25e60
commit 15dd073e0c
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/materialBrowserQmlSource/TextureItem.qml
View File

@@ -26,7 +26,7 @@ Image {
onPressed: (mouse) => { onPressed: (mouse) => {
if (mouse.button === Qt.LeftButton) if (mouse.button === Qt.LeftButton)
rootView.startDragTexture(modelData, mapToGlobal(mouse.x, mouse.y)) rootView.startDragTexture(index, mapToGlobal(mouse.x, mouse.y))
else if (mouse.button === Qt.RightButton) else if (mouse.button === Qt.RightButton)
root.showContextMenu() root.showContextMenu()
} }

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

@@ -12,6 +12,7 @@
#include <documentmanager.h> #include <documentmanager.h>
#include <qmldesignerconstants.h> #include <qmldesignerconstants.h>
#include <qmldesignerplugin.h> #include <qmldesignerplugin.h>
#include <variantproperty.h>
#include <theme.h> #include <theme.h>
@@ -93,23 +94,36 @@ bool MaterialBrowserWidget::eventFilter(QObject *obj, QEvent *event)
Model *model = document->currentModel(); Model *model = document->currentModel();
QTC_ASSERT(model, return false); QTC_ASSERT(model, return false);
if (m_materialToDrag.isValid()) { if (m_materialToDrag.isValid() || m_textureToDrag.isValid()) {
QMouseEvent *me = static_cast<QMouseEvent *>(event); QMouseEvent *me = static_cast<QMouseEvent *>(event);
if ((me->globalPos() - m_dragStartPoint).manhattanLength() > 20) { if ((me->globalPos() - m_dragStartPoint).manhattanLength() > 20) {
bool isMaterial = m_materialToDrag.isValid();
QByteArray data; QByteArray data;
QMimeData *mimeData = new QMimeData; QMimeData *mimeData = new QMimeData;
QDataStream stream(&data, QIODevice::WriteOnly); QDataStream stream(&data, QIODevice::WriteOnly);
stream << m_materialToDrag.internalId(); stream << m_materialToDrag.internalId();
mimeData->setData(Constants::MIME_TYPE_MATERIAL, data); mimeData->setData(isMaterial ? QString::fromLatin1(Constants::MIME_TYPE_MATERIAL)
: QString::fromLatin1(Constants::MIME_TYPE_TEXTURE),
data);
mimeData->removeFormat("text/plain"); mimeData->removeFormat("text/plain");
model->startDrag(mimeData, m_previewImageProvider->requestPixmap( if (isMaterial) {
QString::number(m_materialToDrag.internalId()), nullptr, {128, 128})); model->startDrag(mimeData, m_previewImageProvider->requestPixmap(
QString::number(m_materialToDrag.internalId()), nullptr, {128, 128}));
} else {
QString iconPath = QLatin1String("%1/%2")
.arg(DocumentManager::currentResourcePath().path(),
m_textureToDrag.variantProperty("source").value().toString());
model->startDrag(mimeData, QPixmap(iconPath).scaled({128, 128}));
}
m_materialToDrag = {}; m_materialToDrag = {};
m_textureToDrag = {};
} }
} }
} else if (event->type() == QMouseEvent::MouseButtonRelease) { } else if (event->type() == QMouseEvent::MouseButtonRelease) {
m_materialToDrag = {}; m_materialToDrag = {};
m_textureToDrag = {};
} }
return QObject::eventFilter(obj, event); return QObject::eventFilter(obj, event);
@@ -197,6 +211,12 @@ void MaterialBrowserWidget::startDragMaterial(int index, const QPointF &mousePos
m_dragStartPoint = mousePos.toPoint(); m_dragStartPoint = mousePos.toPoint();
} }
void MaterialBrowserWidget::startDragTexture(int index, const QPointF &mousePos)
{
m_textureToDrag = m_materialBrowserTexturesModel->textureAt(index);
m_dragStartPoint = mousePos.toPoint();
}
void MaterialBrowserWidget::acceptBundleMaterialDrop() void MaterialBrowserWidget::acceptBundleMaterialDrop()
{ {
m_materialBrowserView->emitCustomNotification("drop_bundle_material", {}, {}); // To ContentLibraryView m_materialBrowserView->emitCustomNotification("drop_bundle_material", {}, {}); // To ContentLibraryView

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

@@ -49,6 +49,7 @@ public:
Q_INVOKABLE void handleSearchFilterChanged(const QString &filterText); Q_INVOKABLE void handleSearchFilterChanged(const QString &filterText);
Q_INVOKABLE void startDragMaterial(int index, const QPointF &mousePos); 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 acceptBundleMaterialDrop();
QQuickWidget *quickWidget() const; QQuickWidget *quickWidget() const;
@@ -72,6 +73,7 @@ private:
QString m_filterText; QString m_filterText;
ModelNode m_materialToDrag; ModelNode m_materialToDrag;
ModelNode m_textureToDrag;
QPoint m_dragStartPoint; QPoint m_dragStartPoint;
}; };

1
src/plugins/qmldesigner/qmldesignerconstants.h
View File

@@ -75,6 +75,7 @@ const char MATERIAL_LIB_ID[] = "__materialLibrary__";
const char MIME_TYPE_ITEM_LIBRARY_INFO[] = "application/vnd.qtdesignstudio.itemlibraryinfo"; const char MIME_TYPE_ITEM_LIBRARY_INFO[] = "application/vnd.qtdesignstudio.itemlibraryinfo";
const char MIME_TYPE_ASSETS[] = "application/vnd.qtdesignstudio.assets"; const char MIME_TYPE_ASSETS[] = "application/vnd.qtdesignstudio.assets";
const char MIME_TYPE_MATERIAL[] = "application/vnd.qtdesignstudio.material"; const char MIME_TYPE_MATERIAL[] = "application/vnd.qtdesignstudio.material";
const char MIME_TYPE_TEXTURE[] = "application/vnd.qtdesignstudio.texture";
const char MIME_TYPE_BUNDLE_MATERIAL[] = "application/vnd.qtdesignstudio.bundlematerial"; const char MIME_TYPE_BUNDLE_MATERIAL[] = "application/vnd.qtdesignstudio.bundlematerial";
const char MIME_TYPE_BUNDLE_TEXTURE[] = "application/vnd.qtdesignstudio.bundletexture"; const char MIME_TYPE_BUNDLE_TEXTURE[] = "application/vnd.qtdesignstudio.bundletexture";
const char MIME_TYPE_ASSET_IMAGE[] = "application/vnd.qtdesignstudio.asset.image"; const char MIME_TYPE_ASSET_IMAGE[] = "application/vnd.qtdesignstudio.asset.image";