diff options
author | Marco Bubke <marco.bubke@nokia.com> | 2010-03-24 19:59:42 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2010-03-30 14:41:54 +0200 |
commit | b92821c617a443cd87698de61ebd67645e9f257e (patch) | |
tree | 4a3b275c0f33f24a69355469f248100f85940cac | |
parent | a82d88df499cddb0e5a644ddb99cfcde9bf79583 (diff) | |
download | qt-creator-b92821c617a443cd87698de61ebd67645e9f257e.tar.gz |
Fix clipping for children
Task-ID: BAUHAUS-501
-rw-r--r-- | src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp index 5c6e3fa4e2..8d9844e971 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp @@ -74,6 +74,8 @@ void FormEditorItem::setup() setOpacity(qmlItemNode().instanceValue("opacity").toDouble()); } + setFlag(QGraphicsItem::ItemClipsChildrenToShape, qmlItemNode().instanceValue("clip").toBool()); + if (QGraphicsItem::parentItem() == scene()->formLayerItem()) m_borderWidth = 0.0; diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index be3dc58a90..b7ff3213ae 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -165,6 +165,9 @@ void FormEditorScene::synchronizeOtherProperty(const QmlItemNode &qmlItemNode, c if (propertyName == "opacity") item->setOpacity(qmlItemNode.instanceValue("opacity").toDouble()); + if (propertyName == "clip") + item->setFlag(QGraphicsItem::ItemClipsChildrenToShape, qmlItemNode.instanceValue("clip").toBool()); + if (item) item->update(); } |