Do not automatically install a scene event filter on items in customcontainments. The custom containment can handle this itself if it feels it appropriate
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=787834
This commit is contained in:
parent
13efb56562
commit
4780390ae2
@ -695,8 +695,7 @@ int Containment::indexAt(const QPointF &pos) const
|
||||
void Containment::prepareApplet(Applet *applet, bool delayInit)
|
||||
{
|
||||
if (delayInit) {
|
||||
if (containmentType() == DesktopContainment ||
|
||||
containmentType() == CustomContainment) {
|
||||
if (containmentType() == DesktopContainment) {
|
||||
applet->installSceneEventFilter(this);
|
||||
}
|
||||
} else {
|
||||
@ -790,8 +789,7 @@ void Containment::appletAnimationComplete(QGraphicsItem *item, Plasma::Phase::An
|
||||
parent = parent->parentItem();
|
||||
}
|
||||
} else if (anim == Phase::Appear) {
|
||||
if ((containmentType() == DesktopContainment ||
|
||||
containmentType() == CustomContainment) &&
|
||||
if (containmentType() == DesktopContainment &&
|
||||
item->parentItem() == this &&
|
||||
qgraphicsitem_cast<Applet*>(item)) {
|
||||
item->installSceneEventFilter(this);
|
||||
|
Loading…
Reference in New Issue
Block a user