alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AppletQuickItem: Don't try to set initial size bigger than parent size

Browse Source 
Trying to set initial size bigger than parent size only results
to item being resized down to fit in parent later.

REVIEW: 126822
BUG: 358200
This commit is contained in:
David Rosca 2016-01-21 15:35:19 +01:00
parent 83cec13edb
commit f688c904a8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plasmaquick/appletquickitem.cpp
View File

@ -535,16 +535,20 @@ void AppletQuickItem::init()
QVariantHash initialProperties; QVariantHash initialProperties;
//initialize with our size only if valid //initialize with our size only if valid
if (width() > 0 && height() > 0) { if (width() > 0 && height() > 0) {
initialProperties[QStringLiteral("width")] = width(); const qreal w = parentItem() ? std::min(parentItem()->width(), width()) : width();
initialProperties[QStringLiteral("height")] = height(); const qreal h = parentItem() ? std::min(parentItem()->height(), height()) : height();
initialProperties[QStringLiteral("width")] = w;
initialProperties[QStringLiteral("height")] = h;
} }
d->qmlObject->setInitializationDelayed(false); d->qmlObject->setInitializationDelayed(false);
d->qmlObject->completeInitialization(initialProperties); d->qmlObject->completeInitialization(initialProperties);
//otherwise, initialize our size to root object's size //otherwise, initialize our size to root object's size
if (d->qmlObject->rootObject() && (width() <= 0 || height() <= 0)) { if (d->qmlObject->rootObject() && (width() <= 0 || height() <= 0)) {
setWidth(d->qmlObject->rootObject()->property("width").value<qreal>()); const qreal w = d->qmlObject->rootObject()->property("width").value<qreal>();
setHeight(d->qmlObject->rootObject()->property("height").value<qreal>()); const qreal h = d->qmlObject->rootObject()->property("height").value<qreal>();
setWidth(parentItem() ? std::min(parentItem()->width(), w) : w);
setHeight(parentItem() ? std::min(parentItem()->height(), h) : h);
} }
//default fullrepresentation is our root main component, if none specified //default fullrepresentation is our root main component, if none specified