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

clear the current widget when an widget is unregistered; solves a crash where the task widget disconnects *all* signals to items before deleting them, thus preventing the destroyed(QObject*) signal from getting through. it was calling unregisterWidget, but that wasn't clearing the current widget -> POOF!

Browse Source 
CCMAIL:faure@kde.org
CCBUG:179819

svn path=/branches/KDE/4.2/kdelibs/; revision=907982
This commit is contained in:
Aaron J. Seigo 2009-01-09 01:16:57 +00:00
parent 602ee72b5a
commit 9f03caaa18
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tooltipmanager.cpp
View File

@ -80,9 +80,8 @@ public :
* called when a widget inside the tooltip manager is deleted * called when a widget inside the tooltip manager is deleted
*/ */
void onWidgetDestroyed(QObject * object); void onWidgetDestroyed(QObject * object);
void removeWidget(QGraphicsWidget *w);
void clearTips(); void clearTips();
void doDelayedHide(); void doDelayedHide();
QGraphicsWidget *currentWidget; QGraphicsWidget *currentWidget;
@ -182,7 +181,6 @@ void ToolTipManager::registerWidget(QGraphicsWidget *widget)
//the tooltip is not registered we add it in our map of tooltips //the tooltip is not registered we add it in our map of tooltips
d->tooltips.insert(widget, ToolTipContent()); d->tooltips.insert(widget, ToolTipContent());
widget->installEventFilter(this); widget->installEventFilter(this);
//connect to object destruction
connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(onWidgetDestroyed(QObject*))); connect(widget, SIGNAL(destroyed(QObject*)), this, SLOT(onWidgetDestroyed(QObject*)));
} }
@ -193,7 +191,7 @@ void ToolTipManager::unregisterWidget(QGraphicsWidget *widget)
} }
widget->removeEventFilter(this); widget->removeEventFilter(this);
d->tooltips.remove(widget); d->removeWidget(widget);
} }
void ToolTipManager::setContent(QGraphicsWidget *widget, const ToolTipContent &data) void ToolTipManager::setContent(QGraphicsWidget *widget, const ToolTipContent &data)
@ -262,7 +260,12 @@ void ToolTipManagerPrivate::onWidgetDestroyed(QObject *object)
// NOTE: DO NOT USE THE w VARIABLE FOR ANYTHING OTHER THAN COMPARING // NOTE: DO NOT USE THE w VARIABLE FOR ANYTHING OTHER THAN COMPARING
// THE ADDRESS! ACTUALLY USING THE OBJECT WILL RESULT IN A CRASH!!! // THE ADDRESS! ACTUALLY USING THE OBJECT WILL RESULT IN A CRASH!!!
QGraphicsWidget *w = static_cast<QGraphicsWidget*>(object); QGraphicsWidget *w = static_cast<QGraphicsWidget*>(object);
removeWidget(w);
}
void ToolTipManagerPrivate::removeWidget(QGraphicsWidget *w)
{
// DO NOTE ACCESS w HERE!! IT MAY BE IN THE PROCESS OF DELETION!
if (currentWidget == w) { if (currentWidget == w) {
currentWidget = 0; currentWidget = 0;
showTimer->stop(); // stop the timer to show the tooltip showTimer->stop(); // stop the timer to show the tooltip