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

Merge "Unify when tooltips are shown and kept alive."

Browse Source
This commit is contained in:
David Edmundson 2015-02-10 15:39:35 +01:00 committed by Gerrit Code Review
commit e0f0d3a948
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/declarativeimports/core/tooltip.cpp
View File

@ -305,6 +305,9 @@ void ToolTip::hoverEnterEvent(QHoverEvent *event)
return;
}
if (!m_mainItem && mainText().isEmpty() && subText().isEmpty()) {
return;
}
if (tooltipDialogInstance()->isVisible()) {
// We signal the tooltipmanager that we're "potentially interested,
// and ask to keep it open for a bit, so other items get the chance
@ -313,7 +316,7 @@ void ToolTip::hoverEnterEvent(QHoverEvent *event)
tooltipDialogInstance()->keepalive();
//FIXME: showToolTip needs to be renamed in sync or something like that
showToolTip();
} else if (m_mainItem || !mainText().isEmpty() || !subText().isEmpty()) {
} else {
m_showTimer->start(m_interval);
}
}