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

QmlDesigner: reduce complexity in DragTool::dragMoveEvent

Browse Source 
Change-Id: Icacf450bfdb6dac277ec37d1e1c61145035b3913
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-07-21 14:11:59 +02:00
parent 3b918faee1
commit 3d1dde2be4
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,25 +334,21 @@ 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) { if (!m_blockMove && !m_isAborted && canHandleMimeData(event->mimeData())) {
if (!m_isAborted) { event->accept();
if (canHandleMimeData(event->mimeData())) { if (m_dragNode.isValid()) {
event->accept(); FormEditorItem *targetContainerItem = targetContainerOrRootItem(itemList);
if (m_dragNode.isValid()) { if (targetContainerItem) {
FormEditorItem *targetContainerItem = targetContainerOrRootItem(itemList); move(event->scenePos(), itemList);
if (targetContainerItem) { } else {
move(event->scenePos(), itemList); end();
} else { m_dragNode.destroy();
end();
m_dragNode.destroy();
}
} else {
createDragNode(event->mimeData(), event->scenePos(), itemList);
}
} }
} else { } else {
event->ignore(); createDragNode(event->mimeData(), event->scenePos(), itemList);
} }
} else{
event->ignore();
} }
} }