yes, visible tips should hide (really, we should just re-use the same actual widget, but that's for later i suppose); also set the delayedHide properly always
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=876181
This commit is contained in:
parent
5eb18a635b
commit
14e75cc43a
@ -147,7 +147,7 @@ void ToolTipManager::show(QGraphicsWidget *widget)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (d->currentWidget) {
|
if (d->currentWidget) {
|
||||||
//hide(d->currentWidget);
|
hide(d->currentWidget);
|
||||||
}
|
}
|
||||||
|
|
||||||
d->hideTimer->stop();
|
d->hideTimer->stop();
|
||||||
@ -359,7 +359,7 @@ void ToolTipManagerPrivate::showToolTip()
|
|||||||
// give the object a chance for delayed loading of the tip
|
// give the object a chance for delayed loading of the tip
|
||||||
QMetaObject::invokeMethod(currentWidget, "toolTipAboutToShow");
|
QMetaObject::invokeMethod(currentWidget, "toolTipAboutToShow");
|
||||||
tooltip = tooltips.value(currentWidget);
|
tooltip = tooltips.value(currentWidget);
|
||||||
kDebug() << "attempt to make one ... we gots" << tooltip;
|
//kDebug() << "attempt to make one ... we gots" << tooltip;
|
||||||
if (tooltip) {
|
if (tooltip) {
|
||||||
justCreated = true;
|
justCreated = true;
|
||||||
} else {
|
} else {
|
||||||
@ -368,16 +368,16 @@ void ToolTipManagerPrivate::showToolTip()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tooltip->setVisible(false);
|
tooltip->hide();
|
||||||
//kDebug() << "about to show" << justCreated;
|
//kDebug() << "about to show" << justCreated;
|
||||||
tooltip->prepareShowing(!justCreated);
|
tooltip->prepareShowing(!justCreated);
|
||||||
tooltip->move(popupPosition(currentWidget, tooltip->size()));
|
tooltip->move(popupPosition(currentWidget, tooltip->size()));
|
||||||
isShown = true; //ToolTip is visible
|
isShown = true; //ToolTip is visible
|
||||||
tooltip->setVisible(true);
|
tooltip->show();
|
||||||
|
|
||||||
if (tooltip->autohide()) {
|
delayedHide = tooltip->autohide();
|
||||||
|
if (delayedHide) {
|
||||||
//kDebug() << "starting authoide";
|
//kDebug() << "starting authoide";
|
||||||
delayedHide = true;
|
|
||||||
hideTimer->start(3000);
|
hideTimer->start(3000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user