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

QmlDesigner: Fix asset drag issue

Browse Source 
Workaround QDrag issue that causes drag to stay active after pressing
and releasing at the same point.

Fixes: QDS-4446
Change-Id: Ieb25656a1e9f42c724a254820c1d290a522835d5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2021-06-03 16:10:40 +03:00
parent 0bb0c5bd88
commit c47f173ba9
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
View File

@@ -154,7 +154,7 @@ Item {
onPressed: { onPressed: {
forceActiveFocus() forceActiveFocus()
if (mouse.button === Qt.LeftButton) if (mouse.button === Qt.LeftButton)
rootView.startDragAsset(filePath) rootView.startDragAsset(filePath, mapToGlobal(mouse.x, mouse.y))
else else
print("TODO: impl context menu") print("TODO: impl context menu")
} }

35
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -115,9 +115,24 @@ bool ItemLibraryWidget::eventFilter(QObject *obj, QEvent *event)
m_itemToDrag = {}; m_itemToDrag = {};
} }
} else if (!m_assetToDrag.isEmpty()) {
QMouseEvent *me = static_cast<QMouseEvent *>(event);
if ((me->globalPos() - m_dragStartPoint).manhattanLength() > 10) {
auto drag = new QDrag(this);
drag->setPixmap(m_assetsIconProvider->requestPixmap(m_assetToDrag, nullptr, {128, 128}));
QMimeData *mimeData = new QMimeData;
mimeData->setData("application/vnd.bauhaus.libraryresource", m_assetToDrag.toUtf8());
mimeData->setData(m_assetToDragTypeAndData.first, m_assetToDragTypeAndData.second);
drag->setMimeData(mimeData);
drag->exec();
drag->deleteLater();
m_assetToDrag.clear();
}
} }
} else if (event->type() == QMouseEvent::MouseButtonRelease) { } else if (event->type() == QMouseEvent::MouseButtonRelease) {
m_itemToDrag = {}; m_itemToDrag = {};
m_assetToDrag.clear();
} }
return QObject::eventFilter(obj, event); return QObject::eventFilter(obj, event);
@@ -186,6 +201,7 @@ ItemLibraryWidget::ItemLibraryWidget(AsynchronousImageCache &imageCache,
new Internal::ItemLibraryImageProvider); new Internal::ItemLibraryImageProvider);
Theme::setupTheme(m_itemViewQuickWidget->engine()); Theme::setupTheme(m_itemViewQuickWidget->engine());
m_itemViewQuickWidget->installEventFilter(this); m_itemViewQuickWidget->installEventFilter(this);
m_assetsWidget->installEventFilter(this);
m_fontPreviewTooltipBackend = std::make_unique<PreviewTooltipBackend>(asynchronousFontImageCache); m_fontPreviewTooltipBackend = std::make_unique<PreviewTooltipBackend>(asynchronousFontImageCache);
// Note: Though the text specified here appears in UI, it shouldn't be translated, as it's // Note: Though the text specified here appears in UI, it shouldn't be translated, as it's
@@ -449,27 +465,22 @@ void ItemLibraryWidget::startDragAndDrop(const QVariant &itemLibEntry, const QPo
{ {
// Actual drag is created after mouse has moved to avoid a QDrag bug that causes drag to stay // Actual drag is created after mouse has moved to avoid a QDrag bug that causes drag to stay
// active (and blocks mouse release) if mouse is released at the same spot of the drag start. // active (and blocks mouse release) if mouse is released at the same spot of the drag start.
// This doesn't completely eliminate the bug but makes it significantly harder to produce.
m_itemToDrag = itemLibEntry; m_itemToDrag = itemLibEntry;
m_dragStartPoint = mousePos.toPoint(); m_dragStartPoint = mousePos.toPoint();
} }
void ItemLibraryWidget::startDragAsset(const QString &assetPath) void ItemLibraryWidget::startDragAsset(const QString &assetPath, const QPointF &mousePos)
{ {
QFileInfo fileInfo(assetPath); QFileInfo fileInfo(assetPath);
QPair<QString, QByteArray> typeAndData = getAssetTypeAndData(fileInfo); m_assetToDragTypeAndData = getAssetTypeAndData(fileInfo);
if (typeAndData.first.isEmpty()) if (m_assetToDragTypeAndData.first.isEmpty())
return; return;
auto drag = new QDrag(this); // Actual drag is created after mouse has moved to avoid a QDrag bug that causes drag to stay
drag->setPixmap(m_assetsIconProvider->requestPixmap(assetPath, nullptr, {128, 128})); // active (and blocks mouse release) if mouse is released at the same spot of the drag start.
QMimeData *mimeData = new QMimeData; m_assetToDrag = fileInfo.absoluteFilePath();
mimeData->setData(QLatin1String("application/vnd.bauhaus.libraryresource"), m_dragStartPoint = mousePos.toPoint();
fileInfo.absoluteFilePath().toUtf8());
mimeData->setData(typeAndData.first, typeAndData.second);
drag->setMimeData(mimeData);
drag->exec();
} }
QPair<QString, QByteArray> ItemLibraryWidget::getAssetTypeAndData(const QFileInfo &fi) const QPair<QString, QByteArray> ItemLibraryWidget::getAssetTypeAndData(const QFileInfo &fi) const

4
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
View File

@@ -93,7 +93,7 @@ public:
QPair<QString, QByteArray> getAssetTypeAndData(const QFileInfo &fi) const; QPair<QString, QByteArray> getAssetTypeAndData(const QFileInfo &fi) const;
Q_INVOKABLE void startDragAndDrop(const QVariant &itemLibEntry, const QPointF &mousePos); Q_INVOKABLE void startDragAndDrop(const QVariant &itemLibEntry, const QPointF &mousePos);
Q_INVOKABLE void startDragAsset(const QString &assetPath); Q_INVOKABLE void startDragAsset(const QString &assetPath, const QPointF &mousePos);
Q_INVOKABLE void removeImport(const QString &importUrl); Q_INVOKABLE void removeImport(const QString &importUrl);
Q_INVOKABLE void addImportForItem(const QString &importUrl); Q_INVOKABLE void addImportForItem(const QString &importUrl);
Q_INVOKABLE void handleTabChanged(int index); Q_INVOKABLE void handleTabChanged(int index);
@@ -143,6 +143,8 @@ private:
AsynchronousImageCache &m_imageCache; AsynchronousImageCache &m_imageCache;
QPointer<Model> m_model; QPointer<Model> m_model;
QVariant m_itemToDrag; QVariant m_itemToDrag;
QString m_assetToDrag;
QPair<QString, QByteArray> m_assetToDragTypeAndData;
bool m_updateRetry = false; bool m_updateRetry = false;
QString m_filterText; QString m_filterText;
QPoint m_dragStartPoint; QPoint m_dragStartPoint;