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

if the applet has width/height in root, use it

Browse Source 
CCBUG:336291
This commit is contained in:
Marco Martin 2014-06-16 14:35:04 +02:00
parent 60ddc9f25d
commit 751b773db2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plasmaquick/appletquickitem.cpp
View File

@ -389,7 +389,6 @@ AppletQuickItem::AppletQuickItem(Plasma::Applet *applet, QQuickItem *parent)
d->compactRepresentationCheckTimer.setInterval(250); d->compactRepresentationCheckTimer.setInterval(250);
connect(&d->compactRepresentationCheckTimer, SIGNAL(timeout()), connect(&d->compactRepresentationCheckTimer, SIGNAL(timeout()),
this, SLOT(compactRepresentationCheck())); this, SLOT(compactRepresentationCheck()));
d->compactRepresentationCheckTimer.start();
d->fullRepresentationResizeTimer.setSingleShot(true); d->fullRepresentationResizeTimer.setSingleShot(true);
d->fullRepresentationResizeTimer.setInterval(250); d->fullRepresentationResizeTimer.setInterval(250);
@ -487,10 +486,19 @@ void AppletQuickItem::init()
//initialize size, so an useless resize less //initialize size, so an useless resize less
QVariantHash initialProperties; QVariantHash initialProperties;
initialProperties["width"] = width(); //initialize with our size only if valid
initialProperties["height"] = height(); if (width() > 0 && height() > 0) {
initialProperties["width"] = width();
initialProperties["height"] = height();
}
d->qmlObject->completeInitialization(initialProperties); d->qmlObject->completeInitialization(initialProperties);
//otherwise, initialize our size to root object's size
if (d->qmlObject->rootObject() && (width() <= 0 || height() <= 0)) {
setWidth(d->qmlObject->rootObject()->property("width").value<qreal>());
setHeight(d->qmlObject->rootObject()->property("height").value<qreal>());
}
//default fullrepresentation is our root main component, if none specified //default fullrepresentation is our root main component, if none specified
if (!d->fullRepresentation) { if (!d->fullRepresentation) {
@ -521,6 +529,8 @@ void AppletQuickItem::init()
d->compactRepresentationExpander = new QQmlComponent(engine, this); d->compactRepresentationExpander = new QQmlComponent(engine, this);
d->compactRepresentationExpander->loadUrl(QUrl::fromLocalFile(d->coronaPackage.filePath("compactapplet"))); d->compactRepresentationExpander->loadUrl(QUrl::fromLocalFile(d->coronaPackage.filePath("compactapplet")));
} }
d->compactRepresentationCheckTimer.start();
} }