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

isContainment() only true for proper containments

Browse Source
This commit is contained in:
Marco Martin 2014-04-10 20:53:19 +02:00
parent 7e3b2ae8af
commit 767336e87e
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plasma/applet.cpp
View File

@ -562,7 +562,7 @@ Types::FormFactor Applet::formFactor() const
Containment *Applet::containment() const
{
Containment *c = qobject_cast<Containment*>(const_cast<Applet*>(this));
if (c) {
if (c && qobject_cast<Corona *>(parent())) {
return c;
}
@ -577,20 +577,6 @@ Containment *Applet::containment() const
parent = parent->parent();
}
if (!c) {
//if the applet is an offscreen widget its parentItem will be 0, while its parent
//will be its parentWidget, so here we check the QObject hierarchy.
QObject *objParent = this->parent();
while (objParent) {
Containment *possibleC = qobject_cast<Containment*>(objParent);
if (possibleC) {
c = possibleC;
break;
}
objParent = objParent->parent();
}
}
return c;
}
@ -757,7 +743,7 @@ void Applet::timerEvent(QTimerEvent *event)
bool Applet::isContainment() const
{
return qobject_cast<const Containment*>(this);
return qobject_cast<const Containment*>(this) && qobject_cast<Corona *>(parent());
}
} // Plasma namespace