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

SyntaxHighlighter: Remove using global fontSettings

Browse Source 
Currently, default font settings are set inside the highlighter
runner after creating a highlighter. It prevents to call
TextEditorSettings::fontSettings() from non-main threads.

Change-Id: I0c806f0f586c67749cb2964bebdf2bf3c58a5302
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-12-13 14:52:44 +01:00
parent 0c9f5c99e7
commit 3208dc92d3
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/texteditor/syntaxhighlighterrunner.cpp
View File

@@ -5,6 +5,7 @@
#include "fontsettings.h"
#include "textdocumentlayout.h"
#include "texteditorsettings.h"
#include <utils/textutils.h>
@@ -19,13 +20,20 @@ class SyntaxHighlighterRunnerPrivate : public QObject
{
Q_OBJECT
public:
void createHighlighter()
{
m_highlighter.reset(m_creator());
m_highlighter->setFontSettings(m_fontSettings);
m_highlighter->setDocument(m_document);
}
SyntaxHighlighterRunnerPrivate(BaseSyntaxHighlighterRunner::SyntaxHighLighterCreator creator,
QTextDocument *document)
: m_creator(creator)
, m_document(document)
{
m_highlighter.reset(m_creator());
m_highlighter->setDocument(document);
m_document = document;
createHighlighter();
}
void create()
@@ -36,8 +44,7 @@ public:
m_document = new QTextDocument(this);
m_document->setDocumentLayout(new TextDocumentLayout(m_document));
m_highlighter.reset(m_creator());
m_highlighter->setDocument(m_document);
createHighlighter();
connect(m_highlighter.get(),
&SyntaxHighlighter::resultsReady,
@@ -102,6 +109,7 @@ private:
BaseSyntaxHighlighterRunner::SyntaxHighLighterCreator m_creator;
std::unique_ptr<SyntaxHighlighter> m_highlighter;
QTextDocument *m_document = nullptr;
const FontSettings m_fontSettings = TextEditorSettings::fontSettings();
};
// ----------------------------- BaseSyntaxHighlighterRunner --------------------------------------