From 7391ba388c1fe93525077afe475c89b5f3924fd9 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Mon, 8 Feb 2010 16:54:14 +0100
Subject: [PATCH] Fix navigation history issues.
Separating navigation history logic from updating of highlights.
---
src/plugins/texteditor/basetexteditor.cpp | 10 +++++++---
src/plugins/texteditor/basetexteditor.h | 1 +
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index addadf7aaab..cf01da50c19 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -223,7 +223,7 @@ BaseTextEditor::BaseTextEditor(QWidget *parent)
d->m_searchResultFormat.setBackground(QColor(0xffef0b));
slotUpdateExtraAreaWidth();
- slotCursorPositionChanged();
+ updateHighlights();
setFrameStyle(QFrame::NoFrame);
d->m_delayedUpdateTimer = new QTimer(this);
@@ -3198,7 +3198,11 @@ void BaseTextEditor::slotCursorPositionChanged()
} else if (d->m_contentsChanged) {
saveCurrentCursorPositionForNavigation();
}
+ updateHighlights();
+}
+void BaseTextEditor::updateHighlights()
+{
if (d->m_parenthesesMatchingEnabled && hasFocus()) {
// Delay update when no matching is displayed yet, to avoid flicker
if (extraSelections(ParenthesesMatchingSelection).isEmpty()
@@ -4774,7 +4778,7 @@ void BaseTextEditor::changeEvent(QEvent *e)
void BaseTextEditor::focusInEvent(QFocusEvent *e)
{
QPlainTextEdit::focusInEvent(e);
- slotCursorPositionChanged();
+ updateHighlights();
}
void BaseTextEditor::focusOutEvent(QFocusEvent *e)
@@ -5157,7 +5161,7 @@ void BaseTextEditor::setDisplaySettings(const DisplaySettings &ds)
d->m_highlightBlocksInfo = BaseTextEditorPrivateHighlightBlocks();
}
- slotCursorPositionChanged();
+ updateHighlights();
viewport()->update();
extraArea()->update();
}
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 0d8a79c24e9..ba4e9f1003b 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -626,6 +626,7 @@ private:
void moveLineUpDown(bool up);
void copyLineUpDown(bool up);
void saveCurrentCursorPositionForNavigation();
+ void updateHighlights();
void updateCurrentLineHighlight();
void drawFoldingMarker(QPainter *painter, const QPalette &pal,
--
GitLab