From 8e9bb26143895a74038768ff9a5c8754b60f35b8 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Mon, 21 Jul 2014 18:06:07 +0200 Subject: [PATCH] QmlDesigner: More cleanup in the drag tool Change-Id: I52cf75ec558b6f59b731abdca2bbebafb527f181 Reviewed-by: Tim Jenssen --- .../qmldesigner/components/formeditor/dragtool.cpp | 14 +++++++------- .../qmldesigner/components/formeditor/dragtool.h | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index ae6892cf3f8..d61c6b7cc19 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -123,12 +123,12 @@ void DragTool::beginWithPoint(const QPointF &beginPoint) void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, const QmlItemNode &parentNode, - const QPointF &scenePos) + const QPointF &scenePosition) { MetaInfo metaInfo = MetaInfo::global(); FormEditorItem *parentItem = scene()->itemForQmlItemNode(parentNode); - QPointF pos = parentItem->mapFromScene(scenePos); + QPointF pos = parentItem->mapFromScene(scenePosition); m_dragNode = QmlItemNode::createQmlItemNode(view(), itemLibraryEntry, pos, parentNode); @@ -139,15 +139,15 @@ void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, void DragTool::createQmlItemNodeFromImage(const QString &imageName, const QmlItemNode &parentNode, - const QPointF &scenePos) + const QPointF &scenePosition) { if (parentNode.isValid()) { MetaInfo metaInfo = MetaInfo::global(); FormEditorItem *parentItem = scene()->itemForQmlItemNode(parentNode); - QPointF pos = parentItem->mapFromScene(scenePos); + QPointF positonInItemSpace = parentItem->qmlItemNode().instanceSceneTransform().inverted().map(scenePosition); - m_dragNode = QmlItemNode::createQmlItemNodeFromImage(view(), imageName, pos, parentNode); + m_dragNode = QmlItemNode::createQmlItemNodeFromImage(view(), imageName, positonInItemSpace, parentNode); QList nodeList; nodeList.append(m_dragNode); @@ -355,7 +355,7 @@ void DragTool::end(Snapper::Snapping useSnapping) clear(); } -void DragTool::move(const QPointF &scenePos, const QList &itemList) +void DragTool::move(const QPointF &scenePosition, const QList &itemList) { if (m_movingItem) { FormEditorItem *containerItem = targetContainerOrRootItem(itemList, m_movingItem.data()); @@ -367,7 +367,7 @@ void DragTool::move(const QPointF &scenePos, const QList &itemL Snapper::Snapping useSnapping = Snapper::UseSnapping; - m_moveManipulator.update(scenePos, useSnapping, MoveManipulator::UseBaseState); + m_moveManipulator.update(scenePosition, useSnapping, MoveManipulator::UseBaseState); } } diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h index 11ef56f04a9..844c980dc86 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.h +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h @@ -73,8 +73,6 @@ public: void beginWithPoint(const QPointF &beginPoint); - //void beginWithPoint(const QPointF &beginPoint); - void clear() QTC_OVERRIDE; void formEditorItemsChanged(const QList &itemList) QTC_OVERRIDE;