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

ignore inactive containment in containmentAt

Browse Source 
Reviewed by: Bhushan Shah <bhush94@gmail.com>
BUG:336168
This commit is contained in:
Marco Martin 2014-06-20 17:29:19 +02:00
parent d3de99eb1e
commit 55b5e815b5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,10 @@ ContainmentInterface::ContainmentInterface(DeclarativeAppletScript *parent, cons
void ContainmentInterface::init()
{
if (qmlObject()->rootObject()) {
return;
}
m_activityInfo = new KActivities::Info(containment()->activity(), this);
connect(m_activityInfo, &KActivities::Info::nameChanged,
this, &ContainmentInterface::activityNameChanged);
@ -247,7 +251,7 @@ QObject *ContainmentInterface::containmentAt(int x, int y)
foreach (Plasma::Containment *c, containment()->corona()->containments()) {
ContainmentInterface *contInterface = c->property("_plasma_graphicObject").value<ContainmentInterface *>();
if (contInterface) {
if (contInterface && contInterface->isVisible()) {
QWindow *w = contInterface->window();
if (w && w->geometry().contains(QPoint(window()->x(), window()->y()) + QPoint(x, y))) {
return contInterface;