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

Prefer other containments than desktop in containmentAt()

Browse Source 
Desktop containment will match every valid pos, so we should
return it only if nothing else matches.

REVIEW: 127075
This commit is contained in:
David Rosca 2016-02-15 19:06:47 +01:00
parent 1e196fdfb2
commit 4d012a8cc5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,17 +270,22 @@ void ContainmentInterface::setAppletArgs(Plasma::Applet *applet, const QString &
QObject *ContainmentInterface::containmentAt(int x, int y)
{
QObject *desktop = Q_NULLPTR;
foreach (Plasma::Containment *c, m_containment->corona()->containments()) {
ContainmentInterface *contInterface = c->property("_plasma_graphicObject").value<ContainmentInterface *>();
if (contInterface && contInterface->isVisible()) {
QWindow *w = contInterface->window();
if (w && w->geometry().contains(QPoint(window()->x(), window()->y()) + QPoint(x, y))) {
return contInterface;
if (c->containmentType() == Plasma::Types::DesktopContainment) {
desktop = contInterface;
} else {
return contInterface;
}
}
}
}
return 0;
return desktop;
}
void ContainmentInterface::addApplet(AppletInterface *applet, int x, int y)