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

TextEditor: cleanup annotation rect cache after mark is removed

Browse Source 
Change-Id: I8a0ab2df9d310da6025325ab3114eeadabfd4fb1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2017-10-06 14:29:13 +02:00
parent 5fb310828e
commit 26d0b536ca
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,6 +97,7 @@
#include <QDebug>
#include <QGridLayout>
#include <QKeyEvent>
#include <QMap>
#include <QMenu>
#include <QMessageBox>
#include <QMimeData>
@@ -427,6 +428,7 @@ public:
void slotUpdateBlockNotify(const QTextBlock &);
void updateTabStops();
void applyFontSettingsDelayed();
void markRemoved(TextMark *mark);
void editorContentsChange(int position, int charsRemoved, int charsAdded);
void documentAboutToBeReloaded();
@@ -673,6 +675,8 @@ TextEditorWidgetPrivate::TextEditorWidgetPrivate(TextEditorWidget *parent)
TextEditorWidgetPrivate::~TextEditorWidgetPrivate()
{
QObject::disconnect(m_document.data(), &TextDocument::markRemoved,
this, &TextEditorWidgetPrivate::markRemoved);
q->disconnect(this);
delete m_toolBar;
}
@@ -3201,6 +3205,9 @@ void TextEditorWidgetPrivate::setupDocumentSignals()
QObject::connect(m_document.data(), &TextDocument::fontSettingsChanged,
this, &TextEditorWidgetPrivate::applyFontSettingsDelayed);
QObject::connect(m_document.data(), &TextDocument::markRemoved,
this, &TextEditorWidgetPrivate::markRemoved);
slotUpdateExtraAreaWidth();
TextEditorSettings *settings = TextEditorSettings::instance();
@@ -6946,6 +6953,17 @@ void TextEditorWidgetPrivate::applyFontSettingsDelayed()
q->triggerPendingUpdates();
}
void TextEditorWidgetPrivate::markRemoved(TextMark *mark)
{
auto it = m_annotationRects.find(mark->lineNumber() - 1);
if (it == m_annotationRects.end())
return;
Utils::erase(it.value(), [mark](AnnotationRect rect) {
return rect.mark == mark;
});
}
void TextEditorWidget::triggerPendingUpdates()
{
if (d->m_fontSettingsNeedsApply)