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

QmlDesigner: Prepare for other layout items

Browse Source 
Change-Id: I831e68877eb3d785b4bbb99db002ab8e42158d75
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-04-18 18:42:58 +02:00
parent 40b62e1cfa
commit ff4457bb46
25 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+4 -4
View File
@@ -131,14 +131,14 @@ void QuickItemNodeInstance::setResizable(bool resizable)
void QuickItemNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty)
{
if (oldParentInstance && oldParentInstance->isPositioner()) {
setInPositioner(false);
setInLayoutable(false);
setMovable(true);
}
ObjectNodeInstance::reparent(oldParentInstance, oldParentProperty, newParentInstance, newParentProperty);
if (newParentInstance && newParentInstance->isPositioner()) {
setInPositioner(true);
setInLayoutable(true);
setMovable(false);
}
@@ -153,8 +153,8 @@ void QuickItemNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParen
refresh();
DesignerSupport::updateDirtyNode(quickItem());
if (parentInstance() && isInPositioner())
parentInstance()->refreshPositioner();
if (parentInstance() && isInLayoutable())
parentInstance()->refreshLayoutable();
}
bool QuickItemNodeInstance::isAnchoredBySibling() const