From f4fbe960f33ed3fb31b07e19dc339cb7b6f0022b Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Thu, 11 Mar 2010 18:01:23 +0100
Subject: [PATCH] QmlDesigner.propertyEditor: fixing of missing anchor updates
---
.../propertyeditor/propertyeditor.cpp | 4 +
.../propertyeditor/qmlanchorbindingproxy.cpp | 81 +++++++++++++++++++
.../propertyeditor/qmlanchorbindingproxy.h | 1 +
3 files changed, 86 insertions(+)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index 51e9bb72c17..db61b2c042f 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -609,6 +609,8 @@ void PropertyEditor::propertiesAboutToBeRemoved(const QList<AbstractProperty>& p
ModelNode node(property.parentModelNode());
if (node == m_selectedNode || QmlObjectNode(m_selectedNode).propertyChangeForCurrentState() == node) {
setValue(m_selectedNode, property.name(), QmlObjectNode(m_selectedNode).instanceValue(property.name()));
+ if (property.name().contains("anchor", Qt::CaseInsensitive))
+ m_currentType->m_backendAnchorBinding.invalidate(m_selectedNode);
}
}
}
@@ -645,6 +647,8 @@ void PropertyEditor::bindingPropertiesChanged(const QList<BindingProperty>& prop
ModelNode node(property.parentModelNode());
if (node == m_selectedNode || QmlObjectNode(m_selectedNode).propertyChangeForCurrentState() == node) {
+ if (property.name().contains("anchor", Qt::CaseInsensitive))
+ m_currentType->m_backendAnchorBinding.invalidate(m_selectedNode);
if ( QmlObjectNode(m_selectedNode).modelNode().property(property.name()).isBindingProperty())
setValue(m_selectedNode, property.name(), QmlObjectNode(m_selectedNode).instanceValue(property.name()));
else
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
index 46f87581082..fb032baa528 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
@@ -28,6 +28,7 @@
**************************************************************************/
#include "qmlanchorbindingproxy.h"
+#include "abstractview.h"
#include <qmlanchors.h>
#include <nodeabstractproperty.h>
#include <nodeinstance.h>
@@ -94,6 +95,49 @@ void QmlAnchorBindingProxy::setup(const QmlItemNode &fxItemNode)
}
}
+void QmlAnchorBindingProxy::invalidate(const QmlItemNode &fxItemNode)
+{
+ m_fxItemNode = fxItemNode;
+
+ m_verticalTarget = m_horizontalTarget = m_topTarget = m_bottomTarget = m_leftTarget = m_rightTarget = m_fxItemNode.modelNode().parentProperty().parentModelNode();
+
+ if (topAnchored())
+ m_topTarget = m_fxItemNode.anchors().instanceAnchor(AnchorLine::Top).qmlItemNode();
+
+ if (bottomAnchored())
+ m_bottomTarget = m_fxItemNode.anchors().instanceAnchor(AnchorLine::Bottom).qmlItemNode();
+
+ if (leftAnchored())
+ m_leftTarget = m_fxItemNode.anchors().instanceAnchor(AnchorLine::Left).qmlItemNode();
+
+ if (rightAnchored())
+ m_rightTarget = m_fxItemNode.anchors().instanceAnchor(AnchorLine::Right).qmlItemNode();
+
+ if (verticalCentered())
+ m_verticalTarget = m_fxItemNode.anchors().instanceAnchor(AnchorLine::VerticalCenter).qmlItemNode();
+
+ if (horizontalCentered())
+ m_horizontalTarget = m_fxItemNode.anchors().instanceAnchor(AnchorLine::HorizontalCenter).qmlItemNode();
+
+ emit topAnchorChanged();
+ emit bottomAnchorChanged();
+ emit leftAnchorChanged();
+ emit rightAnchorChanged();
+ emit centeredHChanged();
+ emit centeredVChanged();
+ emit anchorsChanged();
+
+ if (m_fxItemNode.hasNodeParent()) {
+ emit itemNodeChanged();
+ emit topTargetChanged();
+ emit bottomTargetChanged();
+ emit leftTargetChanged();
+ emit rightTargetChanged();
+ emit verticalTargetChanged();
+ emit horizontalTargetChanged();
+ }
+}
+
bool QmlAnchorBindingProxy::hasParent()
{
return m_fxItemNode.isValid() && m_fxItemNode.hasNodeParent();
@@ -127,6 +171,8 @@ bool QmlAnchorBindingProxy::hasAnchors()
void QmlAnchorBindingProxy::setTopTarget(const QVariant &target)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
QmlItemNode newTarget(target.value<ModelNode>());
if (newTarget == m_topTarget)
@@ -141,6 +187,8 @@ void QmlAnchorBindingProxy::setTopTarget(const QVariant &target)
void QmlAnchorBindingProxy::setBottomTarget(const QVariant &target)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
QmlItemNode newTarget(target.value<ModelNode>());
if (newTarget == m_bottomTarget)
@@ -154,6 +202,8 @@ void QmlAnchorBindingProxy::setBottomTarget(const QVariant &target)
void QmlAnchorBindingProxy::setLeftTarget(const QVariant &target)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
QmlItemNode newTarget(target.value<ModelNode>());
if (newTarget == m_leftTarget)
@@ -167,6 +217,8 @@ void QmlAnchorBindingProxy::setLeftTarget(const QVariant &target)
void QmlAnchorBindingProxy::setRightTarget(const QVariant &target)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
QmlItemNode newTarget(target.value<ModelNode>());
if (newTarget == m_rightTarget)
@@ -180,6 +232,8 @@ void QmlAnchorBindingProxy::setRightTarget(const QVariant &target)
void QmlAnchorBindingProxy::setVerticalTarget(const QVariant &target)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
QmlItemNode newTarget(target.value<ModelNode>());
if (newTarget == m_verticalTarget)
@@ -193,6 +247,8 @@ void QmlAnchorBindingProxy::setVerticalTarget(const QVariant &target)
void QmlAnchorBindingProxy::setHorizontalTarget(const QVariant &target)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
QmlItemNode newTarget(target.value<ModelNode>());
if (newTarget == m_horizontalTarget)
@@ -205,6 +261,8 @@ void QmlAnchorBindingProxy::setHorizontalTarget(const QVariant &target)
}
void QmlAnchorBindingProxy::resetLayout() {
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
m_fxItemNode.anchors().removeAnchors();
m_fxItemNode.anchors().removeMargins();
@@ -217,6 +275,8 @@ void QmlAnchorBindingProxy::resetLayout() {
void QmlAnchorBindingProxy::setBottomAnchor(bool anchor)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
if (!m_fxItemNode.hasNodeParent())
return;
@@ -236,6 +296,8 @@ void QmlAnchorBindingProxy::setBottomAnchor(bool anchor)
void QmlAnchorBindingProxy::setLeftAnchor(bool anchor)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
if (!m_fxItemNode.hasNodeParent())
return;
@@ -254,6 +316,8 @@ void QmlAnchorBindingProxy::setLeftAnchor(bool anchor)
void QmlAnchorBindingProxy::setRightAnchor(bool anchor)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
if (!m_fxItemNode.hasNodeParent())
return;
@@ -346,6 +410,8 @@ void QmlAnchorBindingProxy::calcRightMargin()
void QmlAnchorBindingProxy::setTopAnchor(bool anchor)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
if (!m_fxItemNode.hasNodeParent())
return ;
@@ -363,27 +429,37 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor)
}
void QmlAnchorBindingProxy::removeTopAnchor() {
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
m_fxItemNode.anchors().removeAnchor(AnchorLine::Top);
m_fxItemNode.anchors().removeMargin(AnchorLine::Top);
}
void QmlAnchorBindingProxy::removeBottomAnchor() {
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
m_fxItemNode.anchors().removeAnchor(AnchorLine::Bottom);
m_fxItemNode.anchors().removeMargin(AnchorLine::Bottom);
}
void QmlAnchorBindingProxy::removeLeftAnchor() {
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
m_fxItemNode.anchors().removeAnchor(AnchorLine::Left);
m_fxItemNode.anchors().removeMargin(AnchorLine::Left);
}
void QmlAnchorBindingProxy::removeRightAnchor() {
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
m_fxItemNode.anchors().removeAnchor(AnchorLine::Right);
m_fxItemNode.anchors().removeMargin(AnchorLine::Right);
}
void QmlAnchorBindingProxy::setVerticalCentered(bool centered)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
if (!m_fxItemNode.hasNodeParent())
return ;
@@ -401,6 +477,8 @@ void QmlAnchorBindingProxy::setVerticalCentered(bool centered)
void QmlAnchorBindingProxy::setHorizontalCentered(bool centered)
{
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
if (!m_fxItemNode.hasNodeParent())
return ;
@@ -428,6 +506,9 @@ bool QmlAnchorBindingProxy::horizontalCentered()
void QmlAnchorBindingProxy::fill()
{
+
+ RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction();
+
m_fxItemNode.anchors().fill();
setHorizontalCentered(false);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
index 6b4704c3032..00eb6e594b3 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h
@@ -73,6 +73,7 @@ public:
~QmlAnchorBindingProxy();
void setup(const QmlItemNode &itemNode);
+ void invalidate(const QmlItemNode &itemNode);
bool topAnchored();
bool bottomAnchored();
--
GitLab