feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Cleanup of Tooltip interface

Browse Source 
Change-Id: If4908e7a5d5ce749ff1e2efc7a026604821737be
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2013-09-11 17:11:15 +02:00
parent ee574f58d6
commit 8098c085fe
11 changed files with 48 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/libs/utils/tooltip/tooltip.cpp
View File

@@ -67,7 +67,8 @@ ToolTip *ToolTip::instance()
void ToolTip::show(const QPoint &pos, const TipContent &content, QWidget *w, const QRect &rect)
{
if (acceptShow(content, pos, w, rect)) {
ToolTip *t = instance();
if (t->acceptShow(content, pos, w, rect)) {
QWidget *target = 0;
if (HostOsInfo::isWindowsHost())
target = QApplication::desktop()->screen(Internal::screenNumber(pos, w));
@@ -76,18 +77,18 @@ void ToolTip::show(const QPoint &pos, const TipContent &content, QWidget *w, con
switch (content.typeId()) {
case TextContent::TEXT_CONTENT_ID:
m_tip = new TextTip(target);
t->m_tip = new TextTip(target);
break;
case ColorContent::COLOR_CONTENT_ID:
m_tip = new ColorTip(target);
t->m_tip = new ColorTip(target);
break;
case WidgetContent::WIDGET_CONTENT_ID:
m_tip = new WidgetTip(target);
t->m_tip = new WidgetTip(target);
break;
}
setUp(pos, content, w, rect);
qApp->installEventFilter(this);
showTip();
t->setUp(pos, content, w, rect);
qApp->installEventFilter(t);
t->showTip();
}
}
@@ -170,9 +171,10 @@ void ToolTip::setTipRect(QWidget *w, const QRect &rect)
}
}
bool ToolTip::isVisible() const
bool ToolTip::isVisible()
{
return m_tip && m_tip->isVisible();
ToolTip *t = instance();
return t->m_tip && t->m_tip->isVisible();
}
void ToolTip::showTip()
@@ -191,7 +193,7 @@ void ToolTip::showTip()
void ToolTip::hide()
{
hideTipWithDelay();
instance()->hideTipWithDelay();
}
void ToolTip::hideTipWithDelay()
@@ -293,13 +295,3 @@ bool ToolTip::eventFilter(QObject *o, QEvent *event)
}
return false;
}
QFont ToolTip::font() const
{
return QApplication::font("QTipLabel");
}
void ToolTip::setFont(const QFont &font)
{
QApplication::setFont(font, "QTipLabel");
}