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

* move the private slots to the private class

Browse Source 
* corrections to the on-destruction handler

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=833491
This commit is contained in:
Aaron J. Seigo 2008-07-16 21:44:19 +00:00
parent 4ce38c254d
commit 84a92918a9
2 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
tooltipmanager.cpp
View File

@ -52,10 +52,20 @@ public :
{
}
void showToolTip();
void resetShownState();
/**
* called when the theme of plasma has change
*/
void themeUpdated();
/**
* called when a widget inside the tooltip manager is deleted
*/
void onWidgetDestroyed(QObject * object);
QGraphicsWidget *currentWidget;
bool isShown;
bool delayedHide;
@ -85,7 +95,7 @@ ToolTipManager::ToolTipManager(QObject* parent)
d(new ToolTipManagerPrivate)
{
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(themeUpdated()));
themeUpdated();
d->themeUpdated();
d->showTimer = new QTimer(this);
d->showTimer->setSingleShot(true);
@ -188,30 +198,37 @@ bool ToolTipManager::widgetHasToolTip(QGraphicsWidget *widget)
return d->tooltips.contains(widget);
}
void ToolTipManager::themeUpdated()
void ToolTipManagerPrivate::themeUpdated()
{
QMapIterator<QGraphicsWidget*, ToolTip *> iterator(d->tooltips);
QMapIterator<QGraphicsWidget*, ToolTip *> iterator(tooltips);
while (iterator.hasNext()) {
iterator.next();
iterator.value()->updateTheme();
}
}
void ToolTipManager::onWidgetDestroyed(QObject * object)
void ToolTipManagerPrivate::onWidgetDestroyed(QObject *object)
{
if (object) {
QMapIterator<QGraphicsWidget*, ToolTip *> iterator(d->tooltips);
while (iterator.hasNext()) {
iterator.next();
if (iterator.key() == object) {
ToolTip * tooltip = iterator.value();
d->tooltips.remove(iterator.key());
d->showTimer->stop(); // stop the timer to show the tooltip
d->delayedHide = false;
d->currentWidget = 0;
tooltip->hide();
delete tooltip;
}
if (!object) {
return;
}
QGraphicsWidget *w = static_cast<QGraphicsWidget*>(object);
if (currentWidget == w) {
currentWidget = 0;
showTimer->stop(); // stop the timer to show the tooltip
delayedHide = false;
}
QMapIterator<QGraphicsWidget*, ToolTip *> iterator(tooltips);
while (iterator.hasNext()) {
iterator.next();
if (iterator.key() == w) {
ToolTip * tooltip = iterator.value();
tooltips.remove(iterator.key());
tooltip->hide();
delete tooltip;
}
}
}
@ -219,13 +236,13 @@ void ToolTipManager::onWidgetDestroyed(QObject * object)
void ToolTipManagerPrivate::resetShownState()
{
if (currentWidget) {
ToolTip * tooltip = tooltips.value(currentWidget);
if (tooltip && (!tooltip->isVisible() || delayedHide)) {
//One might have moused out and back in again
delayedHide = false;
isShown = false;
tooltip->hide();
currentWidget = 0;
ToolTip * tooltip = tooltips.value(currentWidget);
if (tooltip && (!tooltip->isVisible() || delayedHide)) {
//One might have moused out and back in again
delayedHide = false;
isShown = false;
tooltip->hide();
currentWidget = 0;
}
}
}
@ -309,4 +326,5 @@ QPoint ToolTipManager::popupPosition(const QGraphicsItem * item, const QSize &s)
}
#include "tooltipmanager.moc"
#include "tooltipmanager.moc"

12
tooltipmanager.h
View File

@ -140,21 +140,13 @@ namespace Plasma
*/
static QPoint popupPosition(const QGraphicsItem * item, const QSize &s);
private Q_SLOTS:
/**
* @internal called when the theme of plasma has change
*/
void themeUpdated();
/**
* @internal called when a widget inside the tooltip manager is deleted
*/
void onWidgetDestroyed(QObject * object);
private:
friend class ToolTipManagerSingleton;
ToolTipManagerPrivate* const d;
Q_PRIVATE_SLOT(d, void showToolTip())
Q_PRIVATE_SLOT(d, void resetShownState())
Q_PRIVATE_SLOT(d, void onWidgetDestroyed(QObject*))
Q_PRIVATE_SLOT(d, void themeUpdated())
};
}
#endif