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

9
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -1546,7 +1546,7 @@ void BaseTextEditorWidget::keyPressEvent(QKeyEvent *e)
{
if (!isModifier(e))
viewport()->setCursor(Qt::BlankCursor);
ToolTip::instance()->hide();
ToolTip::hide();
d->m_moveLineUndoHack = false;
d->clearVisibleFoldedBlock();
@@ -2599,8 +2599,7 @@ bool BaseTextEditorWidget::viewportEvent(QEvent *event)
RefactorMarker refactorMarker = d->m_refactorOverlay->markerAt(pos);
if (refactorMarker.isValid() && !refactorMarker.tooltip.isEmpty()) {
ToolTip::instance()->show(he->globalPos(),
TextContent(refactorMarker.tooltip),
ToolTip::show(he->globalPos(), TextContent(refactorMarker.tooltip),
viewport(),
refactorMarker.rect);
return true;
@@ -4267,8 +4266,8 @@ void BaseTextEditorWidget::keyReleaseEvent(QKeyEvent *e)
clearLink();
} else if (e->key() == Qt::Key_Shift
&& d->m_behaviorSettings.m_constrainHoverTooltips
&& ToolTip::instance()->isVisible()) {
ToolTip::instance()->hide();
&& ToolTip::isVisible()) {
ToolTip::hide();
} else if (e->key() == Qt::Key_Alt
&& d->m_maybeFakeTooltipEvent) {
d->m_maybeFakeTooltipEvent = false;