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

erf; this got committed in amongst code for a different problem and reintroduced br#179819

Browse Source 
BUG:245743

svn path=/trunk/KDE/kdelibs/; revision=1156388
This commit is contained in:
Aaron J. Seigo 2010-07-29 03:26:06 +00:00
parent 1259ea24cd
commit 47c26b3726
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tooltipmanager.cpp
View File

@ -151,10 +151,6 @@ void ToolTipManager::show(QGraphicsWidget *widget)
return;
}
if (d->currentWidget) {
disconnect(this, 0, d->currentWidget, 0);
}
d->hideTimer->stop();
d->delayedHide = false;
d->showTimer->stop();
@ -193,10 +189,6 @@ void ToolTipManager::hide(QGraphicsWidget *widget)
return;
}
if (d->currentWidget) {
disconnect(this, 0, d->currentWidget, 0);
}
d->currentWidget = 0;
d->showTimer->stop(); // stop the timer to show the tooltip
d->delayedHide = false;
@ -302,10 +294,6 @@ void ToolTipManagerPrivate::onWidgetDestroyed(QObject *object)
void ToolTipManagerPrivate::removeWidget(QGraphicsWidget *w, bool canSafelyAccess)
{
if (currentWidget == w && currentWidget) {
if (canSafelyAccess) {
QObject::disconnect(q, 0, currentWidget, 0);
}
currentWidget = 0;
showTimer->stop(); // stop the timer to show the tooltip
tipWidget->setContent(0, ToolTipContent());
@ -313,6 +301,10 @@ void ToolTipManagerPrivate::removeWidget(QGraphicsWidget *w, bool canSafelyAcces
delayedHide = false;
}
if (w && canSafelyAccess) {
QObject::disconnect(q, 0, w, 0);
}
tooltips.remove(w);
}
@ -328,7 +320,6 @@ void ToolTipManagerPrivate::resetShownState()
//One might have moused out and back in again
delayedHide = false;
isShown = false;
QObject::disconnect(q, 0, currentWidget, 0);
currentWidget = 0;
tipWidget->hide();
}