handles are now children of the applet, so we don't need to destroy them ourselves; we do need to clear the applet pointer in the handle before it is destroyed, however.
BUG:209058 svn path=/trunk/KDE/kdelibs/; revision=1035446
This commit is contained in:
parent
0d90362d1a
commit
c5833d1939
@ -2184,7 +2184,6 @@ void ContainmentPrivate::appletDestroyed(Plasma::Applet *applet)
|
|||||||
if (q->scene()) {
|
if (q->scene()) {
|
||||||
q->scene()->removeItem(handle);
|
q->scene()->removeItem(handle);
|
||||||
}
|
}
|
||||||
handle->deleteLater();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
emit q->appletRemoved(applet);
|
emit q->appletRemoved(applet);
|
||||||
|
@ -85,7 +85,7 @@ AppletHandle::AppletHandle(Containment *parent, Applet *applet, const QPointF &h
|
|||||||
|
|
||||||
connect(m_hoverTimer, SIGNAL(timeout()), this, SLOT(hoverTimeout()));
|
connect(m_hoverTimer, SIGNAL(timeout()), this, SLOT(hoverTimeout()));
|
||||||
connect(m_leaveTimer, SIGNAL(timeout()), this, SLOT(leaveTimeout()));
|
connect(m_leaveTimer, SIGNAL(timeout()), this, SLOT(leaveTimeout()));
|
||||||
connect(m_applet, SIGNAL(destroyed(QObject*)), this, SLOT(appletDestroyed()));
|
connect(m_applet, SIGNAL(appletDestroyed(Plasma::Applet*)), this, SLOT(appletDestroyed()));
|
||||||
|
|
||||||
setAcceptsHoverEvents(true);
|
setAcceptsHoverEvents(true);
|
||||||
m_hoverTimer->start();
|
m_hoverTimer->start();
|
||||||
|
Loading…
Reference in New Issue
Block a user