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

Utils: Start simplification of tooltip handling

Browse Source 
There's a bit too much unneeded flexibility in there, requiring extra
boiler-plate code on the user side.

Change-Id: I34d03838fb1cd3182fcbb93bf65158ebfc7e2bce
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2014-12-08 10:57:05 +01:00
parent 89115df9ba
commit 50ad32a25b
14 changed files with 125 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,8 +51,8 @@ using namespace Internal;
ToolTip::ToolTip() : m_tip(0), m_widget(0)
{
connect(&m_showTimer, SIGNAL(timeout()), this, SLOT(hideTipImmediately()));
connect(&m_hideDelayTimer, SIGNAL(timeout()), this, SLOT(hideTipImmediately()));
connect(&m_showTimer, &QTimer::timeout, this, &ToolTip::hideTipImmediately);
connect(&m_hideDelayTimer, &QTimer::timeout, this, &ToolTip::hideTipImmediately);
}
ToolTip::~ToolTip()
@@ -66,9 +66,19 @@ ToolTip *ToolTip::instance()
return &tooltip;
}
void ToolTip::show(const QPoint &pos, const TipContent &content, QWidget *w, const QRect &rect)
void ToolTip::show(const QPoint &pos, const QString &content, QWidget *w, const QRect &rect)
{
instance()->showInternal(pos, content, w, rect);
instance()->showInternal(pos, TipContent(content), w, rect);
}
void ToolTip::show(const QPoint &pos, const QColor &color, QWidget *w, const QRect &rect)
{
instance()->showInternal(pos, TipContent(color), w, rect);
}
void ToolTip::show(const QPoint &pos, QWidget *content, QWidget *w, const QRect &rect)
{
instance()->showInternal(pos, TipContent(content, true), w, rect);
}
void ToolTip::move(const QPoint &pos, QWidget *w)
@@ -77,11 +87,6 @@ void ToolTip::move(const QPoint &pos, QWidget *w)
instance()->placeTip(pos, w);
}
void ToolTip::show(const QPoint &pos, const TipContent &content, QWidget *w)
{
show(pos, content, w, QRect());
}
bool ToolTip::acceptShow(const TipContent &content,
const QPoint &pos,
QWidget *w,
@@ -209,13 +214,13 @@ void ToolTip::showInternal(const QPoint &pos, const TipContent &content, QWidget
target = w;
switch (content.typeId()) {
case TextContent::TEXT_CONTENT_ID:
m_tip = new TextTip(target);
break;
case ColorContent::COLOR_CONTENT_ID:
case TipContent::COLOR_CONTENT_ID:
m_tip = new ColorTip(target);
break;
case WidgetContent::WIDGET_CONTENT_ID:
case TipContent::TEXT_CONTENT_ID:
m_tip = new TextTip(target);
break;
case TipContent::WIDGET_CONTENT_ID:
m_tip = new WidgetTip(target);
break;
}