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

Reduce calls to ShellCorona::screenForContainment

Browse Source 
Just store some values instead of calling repeatedly without reason.
This commit is contained in:
Aleix Pol 2014-05-13 14:15:46 +02:00
parent cc661dfdd6
commit da190fa711
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -170,14 +170,15 @@ void ContainmentInterface::setContainmentType(Plasma::Types::ContainmentType typ
QVariantList ContainmentInterface::availableScreenRegion() const QVariantList ContainmentInterface::availableScreenRegion() const
{ {
QRegion reg = QRect(0, 0, width(), height()); QRegion reg = QRect(0, 0, width(), height());
if (containment()->screen() > -1 && containment()->corona()) { int screenId = screen();
reg = containment()->corona()->availableScreenRegion(containment()->screen()); if (screenId > -1 && containment()->corona()) {
reg = containment()->corona()->availableScreenRegion(screenId);
} }
QVariantList regVal; QVariantList regVal;
foreach (QRect rect, reg.rects()) { foreach (QRect rect, reg.rects()) {
//make it relative //make it relative
QRect geometry = containment()->corona()->screenGeometry(containment()->screen()); QRect geometry = containment()->corona()->screenGeometry(screenId);
rect.moveTo(rect.topLeft() - geometry.topLeft()); rect.moveTo(rect.topLeft() - geometry.topLeft());
regVal << QVariant::fromValue(QRectF(rect)); regVal << QVariant::fromValue(QRectF(rect));
} }
@ -188,10 +189,12 @@ QRect ContainmentInterface::availableScreenRect() const
{ {
QRect rect(0, 0, width(), height()); QRect rect(0, 0, width(), height());
if (containment()->screen() > -1 && containment()->corona()) { int screenId = screen();
rect = containment()->corona()->availableScreenRect(containment()->screen());
if (screenId > -1 && containment()->corona()) {
rect = containment()->corona()->availableScreenRect(screenId);
//make it relative //make it relative
QRect geometry = containment()->corona()->screenGeometry(containment()->screen()); QRect geometry = containment()->corona()->screenGeometry(screenId);
rect.moveTo(rect.topLeft() - geometry.topLeft()); rect.moveTo(rect.topLeft() - geometry.topLeft());
} }