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

QmlDesigner: Respect hints in DragTool

Browse Source 
Change-Id: Ic5af9dd39a1442d9c8a868ccf0afe9f2f6e720f7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2017-01-24 15:30:08 +01:00
parent c0e63ee784
commit a28d9f739a
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/qmldesigner/components/formeditor/dragtool.cpp
View File

@@ -28,6 +28,7 @@
#include "formeditorscene.h" #include "formeditorscene.h"
#include "formeditorview.h" #include "formeditorview.h"
#include <metainfo.h> #include <metainfo.h>
#include <nodehints.h>
#include <rewritingexception.h> #include <rewritingexception.h>
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
@@ -210,12 +211,34 @@ void DragTool::abort()
} }
} }
static ItemLibraryEntry itemLibraryEntryFromMimeData(const QMimeData *mimeData)
{
QByteArray data = mimeData->data(QStringLiteral("application/vnd.bauhaus.itemlibraryinfo"));
QDataStream stream(data);
ItemLibraryEntry itemLibraryEntry;
stream >> itemLibraryEntry;
return itemLibraryEntry;
}
static bool canBeDropped(const QMimeData *mimeData)
{
return NodeHints::fromItemLibraryEntry(itemLibraryEntryFromMimeData(mimeData)).canBeDroppedInFormEditor();
}
static bool canHandleMimeData(const QMimeData *mimeData) static bool canHandleMimeData(const QMimeData *mimeData)
{ {
return mimeData->hasFormat(QStringLiteral("application/vnd.bauhaus.itemlibraryinfo")) return mimeData->hasFormat(QStringLiteral("application/vnd.bauhaus.itemlibraryinfo"))
|| mimeData->hasFormat(QStringLiteral("application/vnd.bauhaus.libraryresource")); || mimeData->hasFormat(QStringLiteral("application/vnd.bauhaus.libraryresource"));
} }
static bool dragAndDropPossible(const QMimeData *mimeData)
{
return canHandleMimeData(mimeData) && canBeDropped(mimeData);
}
static bool hasItemLibraryInfo(const QMimeData *mimeData) static bool hasItemLibraryInfo(const QMimeData *mimeData)
{ {
return mimeData->hasFormat(QStringLiteral("application/vnd.bauhaus.itemlibraryinfo")); return mimeData->hasFormat(QStringLiteral("application/vnd.bauhaus.itemlibraryinfo"));
@@ -228,7 +251,7 @@ static bool hasLibraryResources(const QMimeData *mimeData)
void DragTool::dropEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneDragDropEvent *event) void DragTool::dropEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneDragDropEvent *event)
{ {
if (canHandleMimeData(event->mimeData())) { if (dragAndDropPossible(event->mimeData())) {
event->accept(); event->accept();
end(generateUseSnapping(event->modifiers())); end(generateUseSnapping(event->modifiers()));
@@ -244,23 +267,13 @@ void DragTool::dropEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSce
} }
} }
static ItemLibraryEntry itemLibraryEntryFromMimeData(const QMimeData *mimeData)
{
QByteArray data = mimeData->data(QStringLiteral("application/vnd.bauhaus.itemlibraryinfo"));
QDataStream stream(data);
ItemLibraryEntry itemLibraryEntry;
stream >> itemLibraryEntry;
return itemLibraryEntry;
}
void DragTool::dragEnterEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneDragDropEvent *event) void DragTool::dragEnterEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneDragDropEvent *event)
{ {
if (canHandleMimeData(event->mimeData())) { if (dragAndDropPossible(event->mimeData())) {
m_blockMove = false; m_blockMove = false;
if (hasItemLibraryInfo(event->mimeData())) { if (hasItemLibraryInfo(event->mimeData())) {
view()->widgetInfo().widget->setFocus(); view()->widgetInfo().widget->setFocus();
m_isAborted = false; m_isAborted = false;
} }
@@ -274,7 +287,7 @@ void DragTool::dragEnterEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphi
void DragTool::dragLeaveEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneDragDropEvent *event) void DragTool::dragLeaveEvent(const QList<QGraphicsItem*> &/*itemList*/, QGraphicsSceneDragDropEvent *event)
{ {
if (canHandleMimeData(event->mimeData())) { if (dragAndDropPossible(event->mimeData())) {
event->accept(); event->accept();
m_moveManipulator.end(); m_moveManipulator.end();
@@ -315,7 +328,7 @@ void DragTool::createDragNode(const QMimeData *mimeData, const QPointF &scenePos
void DragTool::dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) void DragTool::dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event)
{ {
if (!m_blockMove && !m_isAborted && canHandleMimeData(event->mimeData())) { if (!m_blockMove && !m_isAborted && dragAndDropPossible(event->mimeData())) {
event->accept(); event->accept();
if (m_dragNode.isValid()) { if (m_dragNode.isValid()) {
FormEditorItem *targetContainerItem = targetContainerOrRootItem(itemList); FormEditorItem *targetContainerItem = targetContainerOrRootItem(itemList);