diff options
author | Marco Bubke <marco.bubke@digia.com> | 2014-04-23 17:20:16 +0200 |
---|---|---|
committer | Marco Bubke <marco.bubke@digia.com> | 2014-04-24 16:22:39 +0200 |
commit | 5ddf4f7c7f03f106a9d10b69da31d9c776f7d22c (patch) | |
tree | 084f741c0f2084e7b9f97d80d730f5ea7aa4707b /src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp | |
parent | a599ea57efbd14d2c8612bb727f39cfa0775a89c (diff) | |
download | qt-creator-5ddf4f7c7f03f106a9d10b69da31d9c776f7d22c.tar.gz |
QmlDesigner: Refactor anchor lines
Change-Id: I594b8255e1515f1307eb6c669e26f0a4045484ed
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp')
-rw-r--r-- | src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp index 3cecfc4763..32f6cfc533 100644 --- a/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/movemanipulator.cpp @@ -146,12 +146,12 @@ void MoveManipulator::begin(const QPointF &beginPoint) foreach (FormEditorItem* item, m_itemList) { if (item && item->qmlItemNode().isValid()) { QmlAnchors anchors(item->qmlItemNode().anchors()); - m_beginTopMarginHash.insert(item, anchors.instanceMargin(AnchorLine::Top)); - m_beginLeftMarginHash.insert(item, anchors.instanceMargin(AnchorLine::Left)); - m_beginRightMarginHash.insert(item, anchors.instanceMargin(AnchorLine::Right)); - m_beginBottomMarginHash.insert(item, anchors.instanceMargin(AnchorLine::Bottom)); - m_beginHorizontalCenterHash.insert(item, anchors.instanceMargin(AnchorLine::HorizontalCenter)); - m_beginVerticalCenterHash.insert(item, anchors.instanceMargin(AnchorLine::VerticalCenter)); + m_beginTopMarginHash.insert(item, anchors.instanceMargin(AnchorLineTop)); + m_beginLeftMarginHash.insert(item, anchors.instanceMargin(AnchorLineLeft)); + m_beginRightMarginHash.insert(item, anchors.instanceMargin(AnchorLineRight)); + m_beginBottomMarginHash.insert(item, anchors.instanceMargin(AnchorLineBottom)); + m_beginHorizontalCenterHash.insert(item, anchors.instanceMargin(AnchorLineHorizontalCenter)); + m_beginVerticalCenterHash.insert(item, anchors.instanceMargin(AnchorLineVerticalCenter)); } } @@ -280,23 +280,23 @@ void MoveManipulator::update(const QPointF& updatePoint, Snapper::Snapping useSn if (stateToBeManipulated == UseCurrentState) { QmlAnchors anchors(item->qmlItemNode().anchors()); - if (anchors.instanceHasAnchor(AnchorLine::Top)) - anchors.setMargin(AnchorLine::Top, m_beginTopMarginHash.value(item) + offsetVector.y()); + if (anchors.instanceHasAnchor(AnchorLineTop)) + anchors.setMargin(AnchorLineTop, m_beginTopMarginHash.value(item) + offsetVector.y()); - if (anchors.instanceHasAnchor(AnchorLine::Left)) - anchors.setMargin(AnchorLine::Left, m_beginLeftMarginHash.value(item) + offsetVector.x()); + if (anchors.instanceHasAnchor(AnchorLineLeft)) + anchors.setMargin(AnchorLineLeft, m_beginLeftMarginHash.value(item) + offsetVector.x()); - if (anchors.instanceHasAnchor(AnchorLine::Bottom)) - anchors.setMargin(AnchorLine::Bottom, m_beginBottomMarginHash.value(item) - offsetVector.y()); + if (anchors.instanceHasAnchor(AnchorLineBottom)) + anchors.setMargin(AnchorLineBottom, m_beginBottomMarginHash.value(item) - offsetVector.y()); - if (anchors.instanceHasAnchor(AnchorLine::Right)) - anchors.setMargin(AnchorLine::Right, m_beginRightMarginHash.value(item) - offsetVector.x()); + if (anchors.instanceHasAnchor(AnchorLineRight)) + anchors.setMargin(AnchorLineRight, m_beginRightMarginHash.value(item) - offsetVector.x()); - if (anchors.instanceHasAnchor(AnchorLine::HorizontalCenter)) - anchors.setMargin(AnchorLine::HorizontalCenter, m_beginHorizontalCenterHash.value(item) + offsetVector.x()); + if (anchors.instanceHasAnchor(AnchorLineHorizontalCenter)) + anchors.setMargin(AnchorLineHorizontalCenter, m_beginHorizontalCenterHash.value(item) + offsetVector.x()); - if (anchors.instanceHasAnchor(AnchorLine::VerticalCenter)) - anchors.setMargin(AnchorLine::VerticalCenter, m_beginVerticalCenterHash.value(item) + offsetVector.y()); + if (anchors.instanceHasAnchor(AnchorLineVerticalCenter)) + anchors.setMargin(AnchorLineVerticalCenter, m_beginVerticalCenterHash.value(item) + offsetVector.y()); item->qmlItemNode().setPosition(positionInContainerSpace); } else { @@ -396,23 +396,23 @@ void MoveManipulator::moveBy(double deltaX, double deltaY) QmlAnchors anchors(item->qmlItemNode().anchors()); - if (anchors.instanceHasAnchor(AnchorLine::Top)) - anchors.setMargin(AnchorLine::Top, anchors.instanceMargin(AnchorLine::Top) + deltaY); + if (anchors.instanceHasAnchor(AnchorLineTop)) + anchors.setMargin(AnchorLineTop, anchors.instanceMargin(AnchorLineTop) + deltaY); - if (anchors.instanceHasAnchor(AnchorLine::Left)) - anchors.setMargin(AnchorLine::Left, anchors.instanceMargin(AnchorLine::Left) + deltaX); + if (anchors.instanceHasAnchor(AnchorLineLeft)) + anchors.setMargin(AnchorLineLeft, anchors.instanceMargin(AnchorLineLeft) + deltaX); - if (anchors.instanceHasAnchor(AnchorLine::Bottom)) - anchors.setMargin(AnchorLine::Bottom, anchors.instanceMargin(AnchorLine::Bottom) - deltaY); + if (anchors.instanceHasAnchor(AnchorLineBottom)) + anchors.setMargin(AnchorLineBottom, anchors.instanceMargin(AnchorLineBottom) - deltaY); - if (anchors.instanceHasAnchor(AnchorLine::Right)) - anchors.setMargin(AnchorLine::Right, anchors.instanceMargin(AnchorLine::Right) - deltaX); + if (anchors.instanceHasAnchor(AnchorLineRight)) + anchors.setMargin(AnchorLineRight, anchors.instanceMargin(AnchorLineRight) - deltaX); - if (anchors.instanceHasAnchor(AnchorLine::HorizontalCenter)) - anchors.setMargin(AnchorLine::HorizontalCenter, anchors.instanceMargin(AnchorLine::HorizontalCenter) + deltaX); + if (anchors.instanceHasAnchor(AnchorLineHorizontalCenter)) + anchors.setMargin(AnchorLineHorizontalCenter, anchors.instanceMargin(AnchorLineHorizontalCenter) + deltaX); - if (anchors.instanceHasAnchor(AnchorLine::VerticalCenter)) - anchors.setMargin(AnchorLine::VerticalCenter, anchors.instanceMargin(AnchorLine::VerticalCenter) + deltaY); + if (anchors.instanceHasAnchor(AnchorLineVerticalCenter)) + anchors.setMargin(AnchorLineVerticalCenter, anchors.instanceMargin(AnchorLineVerticalCenter) + deltaY); item->qmlItemNode().setPosition(QPointF(item->qmlItemNode().instanceValue("x").toDouble() + deltaX, item->qmlItemNode().instanceValue("y").toDouble() + deltaY)); |