From 649012a2cbe9322d247575739db0ca7c48c52f7a Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 20 Sep 2010 14:05:47 +0200
Subject: [PATCH] QmlDesigner.nodeInstances: fix default root item size
---
.../instances/qmlgraphicsitemnodeinstance.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
index 121b6e03113..707592bde00 100644
--- a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
@@ -121,13 +121,15 @@ QSizeF QmlGraphicsItemNodeInstance::size() const
if (modelNode().isRootNode()) {
if (!m_hasWidth) {
qmlGraphicsItem()->blockSignals(true);
- qmlGraphicsItem()->setWidth(100.);
+ if (qmlGraphicsItem()->width() < 10.)
+ qmlGraphicsItem()->setWidth(100.);
qmlGraphicsItem()->blockSignals(false);
}
if (!m_hasHeight) {
qmlGraphicsItem()->blockSignals(true);
- qmlGraphicsItem()->setHeight(100.);
+ if (qmlGraphicsItem()->height() < 10.)
+ qmlGraphicsItem()->setHeight(100.);
qmlGraphicsItem()->blockSignals(false);
}
}
@@ -163,13 +165,15 @@ QRectF QmlGraphicsItemNodeInstance::boundingRect() const
if (modelNode().isRootNode()) {
if (!m_hasWidth) {
qmlGraphicsItem()->blockSignals(true);
- qmlGraphicsItem()->setWidth(100.);
+ if (qmlGraphicsItem()->width() < 10.)
+ qmlGraphicsItem()->setWidth(100.);
qmlGraphicsItem()->blockSignals(false);
}
if (!m_hasHeight) {
qmlGraphicsItem()->blockSignals(true);
- qmlGraphicsItem()->setHeight(100.);
+ if (qmlGraphicsItem()->height() < 10.)
+ qmlGraphicsItem()->setHeight(100.);
qmlGraphicsItem()->blockSignals(false);
}
}
--
GitLab