diff --git a/src/lib_gui/qt/utility/QtHighlighter.cpp b/src/lib_gui/qt/utility/QtHighlighter.cpp index 311e87e9..a8925d3d 100644 --- a/src/lib_gui/qt/utility/QtHighlighter.cpp +++ b/src/lib_gui/qt/utility/QtHighlighter.cpp @@ -8,6 +8,7 @@ QVector QtHighlighter::s_highlightingRules; QtHighlighter::HighlightingRule QtHighlighter::s_quotationRule; QtHighlighter::HighlightingRule QtHighlighter::s_commentRule; +QTextCharFormat QtHighlighter::s_textFormat; void QtHighlighter::createHighlightingRules() { @@ -36,6 +37,8 @@ void QtHighlighter::createHighlightingRules() ColorScheme* scheme = ColorScheme::getInstance().get(); + s_textFormat.setForeground(QColor(scheme->getSyntaxColor("normal").c_str())); + QColor directiveColor(scheme->getSyntaxColor("directive").c_str()); QColor keywordColor(scheme->getSyntaxColor("keyword").c_str()); QColor typeColor(scheme->getSyntaxColor("type").c_str()); @@ -88,6 +91,15 @@ void QtHighlighter::highlightDocument() QTextDocument* doc = document(); + int docStart = 0; + int docEnd = 0; + for (int i = 0; i < doc->blockCount(); i++) + { + docEnd += doc->findBlockByLineNumber(i).length(); + } + docEnd -= 1; + applyFormat(docStart, docEnd, s_textFormat); + std::vector> ranges; for (QTextBlock it = doc->begin(); it != doc->end(); it = it.next()) diff --git a/src/lib_gui/qt/utility/QtHighlighter.h b/src/lib_gui/qt/utility/QtHighlighter.h index 6eb329b0..a5ca9e09 100644 --- a/src/lib_gui/qt/utility/QtHighlighter.h +++ b/src/lib_gui/qt/utility/QtHighlighter.h @@ -42,6 +42,7 @@ private: static QVector s_highlightingRules; static HighlightingRule s_quotationRule; static HighlightingRule s_commentRule; + static QTextCharFormat s_textFormat; }; #endif // QT_HIGHLIGHTER_H