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

TextEditor: Only use the last mouse position when updating links

Browse Source 
Fixes building up of sluggishness when hovering text while keeping
Ctrl pressed.

To make sure link clicks are handled correctly, an immediate update
is forced in case of mouse press.

Task-number: QTCREATORBUG-12573
Task-number: QTCREATORBUG-9008
Change-Id: Ieb85d9f2a1e82167dd9a9245e4bc48766d71ae93
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Thorbjørn Lindeijer
2015-09-21 10:27:43 +02:00
parent cd6452f242
commit 9bf4cc61e0
1 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/plugins/texteditor/texteditor.cpp
View File

@@ -290,7 +290,8 @@ public:
QTextBlock foldedBlockAt(const QPoint &pos, QRect *box = 0) const;
void updateLink(QMouseEvent *e);
void requestUpdateLink(QMouseEvent *e, bool immediate = false);
void updateLink();
void showLink(const TextEditorWidget::Link &);
void clearLink();
@@ -409,7 +410,8 @@ public:
TextEditorWidget::Link m_currentLink;
bool m_linkPressed;
TextEditorWidget::Link m_lastLinkUnderCursor;
QTextCursor m_pendingLinkUpdate;
QTextCursor m_lastLinkUpdate;
QRegExp m_searchExpr;
FindFlags m_findFlags;
@@ -4842,7 +4844,7 @@ void TextEditorWidgetPrivate::clearVisibleFoldedBlock()
void TextEditorWidget::mouseMoveEvent(QMouseEvent *e)
{
d->updateLink(e);
d->requestUpdateLink(e);
if (e->buttons() == Qt::NoButton) {
const QTextBlock collapsedBlock = d->foldedBlockAt(e->pos());
@@ -4954,7 +4956,7 @@ void TextEditorWidget::mousePressEvent(QMouseEvent *e)
if (refactorMarker.isValid()) {
onRefactorMarkerClicked(refactorMarker);
} else {
d->updateLink(e);
d->requestUpdateLink(e, true);
if (d->m_currentLink.hasValidLinkText())
d->m_linkPressed = true;
@@ -5514,7 +5516,7 @@ bool TextEditorWidget::openLink(const Link &link, bool inNextSplit)
Id(), flags);
}
void TextEditorWidgetPrivate::updateLink(QMouseEvent *e)
void TextEditorWidgetPrivate::requestUpdateLink(QMouseEvent *e, bool immediate)
{
if (!q->mouseNavigationEnabled())
return;
@@ -5522,6 +5524,11 @@ void TextEditorWidgetPrivate::updateLink(QMouseEvent *e)
// Link emulation behaviour for 'go to definition'
const QTextCursor cursor = q->cursorForPosition(e->pos());
// Avoid updating the link we already found
if (cursor.position() >= m_currentLink.linkTextStart
&& cursor.position() <= m_currentLink.linkTextEnd)
return;
// Check that the mouse was actually on the text somewhere
bool onText = q->cursorRect(cursor).right() >= e->x();
if (!onText) {
@@ -5530,22 +5537,34 @@ void TextEditorWidgetPrivate::updateLink(QMouseEvent *e)
onText = q->cursorRect(nextPos).right() >= e->x();
}
if (cursor.position() < m_lastLinkUnderCursor.linkTextStart
|| cursor.position() > m_lastLinkUnderCursor.linkTextEnd) {
m_lastLinkUnderCursor = q->findLinkAt(cursor, false);
}
if (onText) {
m_pendingLinkUpdate = cursor;
if (onText && m_lastLinkUnderCursor.hasValidLinkText()) {
showLink(m_lastLinkUnderCursor);
} else {
clearLink();
// setting position to prevent multiple calls to findLinkAt for the same position
m_lastLinkUnderCursor.linkTextStart = cursor.position();
m_lastLinkUnderCursor.linkTextEnd = cursor.position();
if (immediate)
updateLink();
else
QTimer::singleShot(0, this, &TextEditorWidgetPrivate::updateLink);
return;
}
} else {
clearLink();
}
clearLink();
}
void TextEditorWidgetPrivate::updateLink()
{
if (m_pendingLinkUpdate.isNull())
return;
if (m_pendingLinkUpdate == m_lastLinkUpdate)
return;
m_lastLinkUpdate = m_pendingLinkUpdate;
const TextEditorWidget::Link link = q->findLinkAt(m_pendingLinkUpdate, false);
if (link.hasValidLinkText())
showLink(link);
else
clearLink();
}
void TextEditorWidgetPrivate::showLink(const TextEditorWidget::Link &link)
@@ -5567,7 +5586,8 @@ void TextEditorWidgetPrivate::showLink(const TextEditorWidget::Link &link)
void TextEditorWidgetPrivate::clearLink()
{
m_lastLinkUnderCursor = TextEditorWidget::Link();
m_pendingLinkUpdate = QTextCursor();
m_lastLinkUpdate = QTextCursor();
if (!m_currentLink.hasValidLinkText())
return;