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

QmlDesigner: Adding layouts to doResetProperty()

Browse Source 
Those have to be hard coded in our code.

Change-Id: I2bdaec0716aeca56df9476f124a47e2dfc1658cb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-09-29 10:46:11 +02:00
committed by Thomas Hartmann
parent 6cbee0ede3
commit de0ed107a2
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
View File

@@ -154,16 +154,48 @@ void registerCustomData(QObject *object)
QVariant getResetValue(QObject *object, const PropertyName &propertyName) QVariant getResetValue(QObject *object, const PropertyName &propertyName)
{ {
return QQuickDesignerSupportProperties::getResetValue(object, propertyName); if (propertyName == "Layout.rowSpan")
return 1;
else if (propertyName == "Layout.columnSpan")
return 1;
else if (propertyName == "Layout.fillHeight")
return false;
else if (propertyName == "Layout.fillWidth")
return false;
else
return QQuickDesignerSupportProperties::getResetValue(object, propertyName);
}
static void setProperty(QObject *object, QQmlContext *context, const PropertyName &propertyName, const QVariant &value)
{
QQmlProperty property(object, propertyName, context);
property.write(value);
} }
void doResetProperty(QObject *object, QQmlContext *context, const PropertyName &propertyName) void doResetProperty(QObject *object, QQmlContext *context, const PropertyName &propertyName)
{ {
QQuickDesignerSupportProperties::doResetProperty(object, context, propertyName); if (propertyName == "Layout.rowSpan")
setProperty(object, context, propertyName, getResetValue(object, propertyName));
else if (propertyName == "Layout.columnSpan")
setProperty(object, context, propertyName, getResetValue(object, propertyName));
else if (propertyName == "Layout.fillHeight")
setProperty(object, context, propertyName, getResetValue(object, propertyName));
else if (propertyName == "Layout.fillWidth")
setProperty(object, context, propertyName, getResetValue(object, propertyName));
else
QQuickDesignerSupportProperties::doResetProperty(object, context, propertyName);
} }
bool hasValidResetBinding(QObject *object, const PropertyName &propertyName) bool hasValidResetBinding(QObject *object, const PropertyName &propertyName)
{ {
if (propertyName == "Layout.rowSpan")
return true;
else if (propertyName == "Layout.columnSpan")
return true;
else if (propertyName == "Layout.fillHeight")
return true;
else if (propertyName == "Layout.fillWidth")
return true;
return QQuickDesignerSupportProperties::hasValidResetBinding(object, propertyName); return QQuickDesignerSupportProperties::hasValidResetBinding(object, propertyName);
} }