diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-05-18 16:48:57 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-05-18 17:11:06 +0200 |
| commit | 76362232b621967fa98457316b218c2cf8ae5e12 (patch) | |
| tree | e8f76090036d253c4dc9a5011b62e9522adf68ea /src/plugins/qmldesigner/components/formeditor/dragtool.cpp | |
| parent | bdd62b8925bf7f4587a366cd7eb84341e8c5eb00 (diff) | |
| download | qt-creator-76362232b621967fa98457316b218c2cf8ae5e12.tar.gz | |
QmlDesigner.DragAndDrop: avoid flicker
Task-number: BAUHAUS-448
Diffstat (limited to 'src/plugins/qmldesigner/components/formeditor/dragtool.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/components/formeditor/dragtool.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index 8b94cfcb33..4e0f19c4b5 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -135,8 +135,6 @@ void DragTool::beginWithPoint(const QPointF &beginPoint) void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlItemNode parentNode, QPointF scenePos) { - QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::hide(); - MetaInfo metaInfo = MetaInfo::global(); FormEditorItem *parentItem = scene()->itemForQmlItemNode(parentNode); @@ -151,6 +149,8 @@ void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlIt nodeList.append(m_dragNode); view()->setSelectedQmlItemNodes(nodeList); m_selectionIndicator.setItems(scene()->itemsForQmlItemNodes(nodeList)); + + QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::hide(); } void DragTool::createQmlItemNodeFromImage(const QString &imageName, QmlItemNode parentNode, QPointF scenePos) @@ -158,8 +158,6 @@ void DragTool::createQmlItemNodeFromImage(const QString &imageName, QmlItemNode if (!parentNode.isValid()) return; - QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::hide(); - MetaInfo metaInfo = MetaInfo::global(); FormEditorItem *parentItem = scene()->itemForQmlItemNode(parentNode); @@ -171,6 +169,8 @@ void DragTool::createQmlItemNodeFromImage(const QString &imageName, QmlItemNode nodeList.append(m_dragNode); view()->setSelectedQmlItemNodes(nodeList); m_selectionIndicator.setItems(scene()->itemsForQmlItemNodes(nodeList)); + + QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::hide(); } FormEditorItem* DragTool::calculateContainer(const QPointF &point, FormEditorItem * currentItem) @@ -256,11 +256,11 @@ void DragTool::dragMoveEvent(QGraphicsSceneDragDropEvent * event) QPointF scenePos = event->scenePos(); if (m_dragNode.isValid()) { - FormEditorItem *parentItem = calculateContainer(event->scenePos() - QPoint(2, 2)); + FormEditorItem *parentItem = calculateContainer(event->scenePos() + QPoint(2, 2)); if (!parentItem) { //if there is no parent any more - the use left the scene end(event->scenePos()); - m_dragNode.destroy(); //delete the node then QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::show(); + m_dragNode.destroy(); //delete the node then return; } //move |