diff options
| author | Marco Bubke <marco.bubke@digia.com> | 2014-07-01 20:32:50 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@digia.com> | 2014-07-02 13:15:59 +0200 |
| commit | f83132a3b35aeaf08fdef82bef24c63c869c5821 (patch) | |
| tree | 784cd893c0493f388def9417de50697384bf9537 /src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp | |
| parent | 0b2cab590abbd4a24999f6ae5d0a45dcd978c34b (diff) | |
QmlDesigner: Change updateTransform to directUpdates
directUpdates is much clearer description of what is the intent of this
new mechanism.
Change-Id: I196b00b924027f92b62490377b270a85f9da1d1d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp index 9c1eba2362..8383023d22 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp @@ -52,7 +52,7 @@ public: isMovable(false), isResizable(false), isInLayoutable(false), - updateTransform(true) + directUpdates(false) {} qint32 parentInstanceId; @@ -72,7 +72,7 @@ public: bool isMovable; bool isResizable; bool isInLayoutable; - bool updateTransform; + bool directUpdates; QHash<PropertyName, QVariant> propertyValues; @@ -135,23 +135,23 @@ qint32 NodeInstance::instanceId() const return -1; } -void NodeInstance::setUpdateTransform(bool updateTransform) +void NodeInstance::setDirectUpdate(bool directUpdates) { if (d) - d->updateTransform = updateTransform; + d->directUpdates = directUpdates; } -bool NodeInstance::updateTransform() const +bool NodeInstance::directUpdates() const { if (d) - return d->updateTransform || d->transform.isRotating() || d->transform.isScaling(); + return d->directUpdates && !(d->transform.isRotating() || d->transform.isScaling()); else return true; } void NodeInstance::setX(double x) { - if(d && !updateTransform()) { + if (d && directUpdates()) { double dx = x - d->transform.dx(); d->transform.translate(dx, 0.0); } @@ -159,7 +159,7 @@ void NodeInstance::setX(double x) void NodeInstance::setY(double y) { - if(d && !updateTransform()) { + if (d && directUpdates()) { double dy = y - d->transform.dy(); d->transform.translate(0.0, dy); } @@ -407,7 +407,7 @@ InformationName NodeInstance::setInformationContentItemBoundingRect(const QRectF InformationName NodeInstance::setInformationTransform(const QTransform &transform) { - if (updateTransform() && d->transform != transform) { + if (!directUpdates() && d->transform != transform) { d->transform = transform; return Transform; } |