when the contianment goes away, zero our pointer to it
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=871483
This commit is contained in:
parent
9c6184b1bf
commit
725c0c3137
7
view.cpp
7
view.cpp
@ -80,6 +80,11 @@ public:
|
|||||||
emit q->sceneRectChanged();
|
emit q->sceneRectChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void containmentDestroyed()
|
||||||
|
{
|
||||||
|
containment = 0;
|
||||||
|
}
|
||||||
|
|
||||||
void initGraphicsView()
|
void initGraphicsView()
|
||||||
{
|
{
|
||||||
q->setFrameShape(QFrame::NoFrame);
|
q->setFrameShape(QFrame::NoFrame);
|
||||||
@ -189,6 +194,7 @@ void View::setContainment(Plasma::Containment *containment)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (d->containment) {
|
if (d->containment) {
|
||||||
|
disconnect(containment, SIGNAL(destroyed()), this, SLOT(containmentDestroyed()));
|
||||||
disconnect(d->containment, SIGNAL(geometryChanged()), this, SLOT(updateSceneRect()));
|
disconnect(d->containment, SIGNAL(geometryChanged()), this, SLOT(updateSceneRect()));
|
||||||
d->containment->removeAssociatedWidget(this);
|
d->containment->removeAssociatedWidget(this);
|
||||||
}
|
}
|
||||||
@ -236,6 +242,7 @@ void View::setContainment(Plasma::Containment *containment)
|
|||||||
}
|
}
|
||||||
|
|
||||||
d->updateSceneRect();
|
d->updateSceneRect();
|
||||||
|
connect(containment, SIGNAL(destroyed()), this, SLOT(containmentDestroyed()));
|
||||||
connect(containment, SIGNAL(geometryChanged()), this, SLOT(updateSceneRect()));
|
connect(containment, SIGNAL(geometryChanged()), this, SLOT(updateSceneRect()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user