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

QmlDesigner: Fix anchoring for application window

Browse Source 
We don't tested that target anchor object are node instances. Now we
search for the parent object recursively.

Change-Id: I2e03e714f858a285309b02f5e88c757f0dcfe7e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-05-21 16:49:28 +02:00
parent 637ce777d3
commit 4f28228293
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/graphicalnodeinstance.cpp
+8 -4
View File
@@ -460,11 +460,15 @@ QPair<PropertyName, ServerNodeInstance> GraphicalNodeInstance::anchor(const Prop
QObject *targetObject = nameObjectPair.second;
PropertyName targetName = nameObjectPair.first.toUtf8();
if (targetObject && nodeInstanceServer()->hasInstanceForObject(targetObject)) {
return qMakePair(targetName, nodeInstanceServer()->instanceForObject(targetObject));
} else {
return ObjectNodeInstance::anchor(name);
while (targetObject) {
if (nodeInstanceServer()->hasInstanceForObject(targetObject))
return qMakePair(targetName, nodeInstanceServer()->instanceForObject(targetObject));
else
targetObject = parentObject(targetObject);
}
return ObjectNodeInstance::anchor(name);
}
static void doComponentCompleteRecursive(QQuickItem *item)
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+1 -1
View File
@@ -1172,7 +1172,7 @@ QObject *ObjectNodeInstance::parent() const
return object()->parent();
}
QObject *parentObject(QObject *object)
QObject *ObjectNodeInstance::parentObject(QObject *object)
{
QQuickItem *quickItem = qobject_cast<QQuickItem*>(object);
if (quickItem && quickItem->parentItem()) {
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
+1
View File
@@ -190,6 +190,7 @@ protected:
void addToNewProperty(QObject *object, QObject *newParent, const PropertyName &newParentProperty);
void deleteObjectsInList(const QQmlProperty &metaProperty);
QVariant convertSpecialCharacter(const QVariant& value) const;
static QObject *parentObject(QObject *object);
private:
QHash<PropertyName, QVariant> m_resetValueHash;