don't show tips when a popup appears (worst thing about spending a day mostly in conf calls: i can only hack in between them, but then often forget to commit *sigh*)

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=874970
This commit is contained in:
Aaron J. Seigo 2008-10-22 22:15:49 +00:00
parent 1facd63fcc
commit 9f70fbd4f3

View File

@ -337,7 +337,10 @@ void ToolTipManagerPrivate::resetShownState()
void ToolTipManagerPrivate::showToolTip() void ToolTipManagerPrivate::showToolTip()
{ {
if (state != ToolTipManager::Activated || !currentWidget) { if (state != ToolTipManager::Activated ||
!currentWidget ||
QApplication::activePopupWidget() ||
QApplication::activeModalWidget()) {
return; return;
} }