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

make :screen() not crash if is child of an applet

Browse Source
This commit is contained in:
Marco Martin 2014-02-21 11:12:27 +01:00
parent 13ec787302
commit e27a2512af
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plasma/containment.cpp
View File

@ -427,7 +427,19 @@ QList<Applet *> Containment::applets() const
int Containment::screen() const
{
return corona()->screenForContainment(this);
if (corona()) {
return corona()->screenForContainment(this);
//case in which this containment is child of an applet, hello systray :)
} else if (Plasma::Applet *parentApplet = qobject_cast<Plasma::Applet *>(parent())) {
if (parentApplet->containment()) {
return parentApplet->containment()->screen();
} else {
return -1;
}
} else {
return -1;
}
}
int Containment::lastScreen() const