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

QmlDesigner: Don't use direct update together with anchors

Browse Source 
Task-number: QTCREATORBUG-12584
Change-Id: I2649f43421e48863d002ae1db34ec5f2276fafd9
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-07-01 18:37:36 +02:00
parent f83132a3b3
commit 25e608cbfd
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/include/nodeinstance.h
View File

@@ -91,6 +91,8 @@ public:
void setX(double x);
void setY(double y);
bool hasAnchors() const;
protected:
void setProperty(const PropertyName &name, const QVariant &value);
InformationName setInformation(InformationName name,

15
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
View File

@@ -144,7 +144,7 @@ void NodeInstance::setDirectUpdate(bool directUpdates)
bool NodeInstance::directUpdates() const
{
if (d)
return d->directUpdates && !(d->transform.isRotating() || d->transform.isScaling());
return d->directUpdates && !(d->transform.isRotating() || d->transform.isScaling() || hasAnchors());
else
return true;
}
@@ -165,6 +165,19 @@ void NodeInstance::setY(double y)
}
}
bool NodeInstance::hasAnchors() const
{
return hasAnchor("anchors.fill")
|| hasAnchor("anchors.centerIn")
|| hasAnchor("anchors.top")
|| hasAnchor("anchors.left")
|| hasAnchor("anchors.right")
|| hasAnchor("anchors.bottom")
|| hasAnchor("anchors.horizontalCenter")
|| hasAnchor("anchors.verticalCenter")
|| hasAnchor("anchors.baseline");
}
bool NodeInstance::isValid() const
{
return instanceId() >= 0 && modelNode().isValid();