avoid a first resize when a declarative item is assigned

This commit is contained in:
Marco Martin 2012-09-20 12:52:06 +02:00
parent e9cee7f69c
commit f4638e3438

View File

@ -35,13 +35,17 @@ void DeclarativeItemContainer::setDeclarativeItem(QDeclarativeItem *item, bool r
if (m_declarativeItem) { if (m_declarativeItem) {
disconnect(m_declarativeItem.data(), 0, this, 0); disconnect(m_declarativeItem.data(), 0, this, 0);
} }
setMinimumWidth(item->implicitWidth());
setMinimumHeight(item->implicitHeight());
resize(item->width(), item->height());
m_declarativeItem = item; m_declarativeItem = item;
if (reparent) { if (reparent) {
static_cast<QGraphicsItem *>(item)->setParentItem(this); static_cast<QGraphicsItem *>(item)->setParentItem(this);
} }
setMinimumWidth(item->implicitWidth());
setMinimumHeight(item->implicitHeight());
resize(item->width(), item->height());
connect(m_declarativeItem.data(), SIGNAL(widthChanged()), this, SLOT(widthChanged())); connect(m_declarativeItem.data(), SIGNAL(widthChanged()), this, SLOT(widthChanged()));
connect(m_declarativeItem.data(), SIGNAL(heightChanged()), this, SLOT(heightChanged())); connect(m_declarativeItem.data(), SIGNAL(heightChanged()), this, SLOT(heightChanged()));
} }