From 84ba7d8a179fa3854bc7e08d762a142159f5cb2d Mon Sep 17 00:00:00 2001 From: m Date: Tue, 23 Jun 2015 02:46:09 +0800 Subject: [PATCH 1/3] fix: UTF-8 characters (when out of comments or quotes) are drawn with different font --- src/sqltextedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sqltextedit.cpp b/src/sqltextedit.cpp index b8dcc2a2..e4a1c916 100644 --- a/src/sqltextedit.cpp +++ b/src/sqltextedit.cpp @@ -108,7 +108,7 @@ void SqlTextEdit::reloadSettings() QFont defaultfont(PreferencesDialog::getSettingsValue("editor", "font").toString()); defaultfont.setStyleHint(QFont::TypeWriter); defaultfont.setPointSize(PreferencesDialog::getSettingsValue("editor", "fontsize").toInt()); - sqlLexer->setDefaultFont(defaultfont); + sqlLexer->setFont(defaultfont); setupSyntaxHighlightingFormat("comment", QsciLexerSQL::Comment); setupSyntaxHighlightingFormat("comment", QsciLexerSQL::CommentLine); setupSyntaxHighlightingFormat("comment", QsciLexerSQL::CommentDoc); From 9af70c042eb63f1acafcbd54a67fed09304548ee Mon Sep 17 00:00:00 2001 From: m Date: Tue, 23 Jun 2015 02:57:26 +0800 Subject: [PATCH 2/3] fix line numbers position recalculation --- src/sqltextedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sqltextedit.cpp b/src/sqltextedit.cpp index e4a1c916..90a6cba1 100644 --- a/src/sqltextedit.cpp +++ b/src/sqltextedit.cpp @@ -63,7 +63,7 @@ void SqlTextEdit::updateLineNumberAreaWidth() // Calculate the width of this number if it was all zeros (this is because a 1 might require less space than a 0 and this could // cause some flickering depending on the font) and set the new margin width. - QFont font = lexer()->defaultFont(QsciLexerSQL::Default); + QFont font = lexer()->font(QsciLexerSQL::Default); setMarginWidth(0, QFontMetrics(font).width(QString("0").repeated(digits)) + 5); } From 3b5053c0a03b7f564ab38a3ea44d0b8e02da71a1 Mon Sep 17 00:00:00 2001 From: m Date: Tue, 23 Jun 2015 03:09:03 +0800 Subject: [PATCH 3/3] set default color to black --- src/sqltextedit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sqltextedit.cpp b/src/sqltextedit.cpp index 90a6cba1..789d63ca 100644 --- a/src/sqltextedit.cpp +++ b/src/sqltextedit.cpp @@ -104,10 +104,10 @@ void SqlTextEdit::reloadKeywords() void SqlTextEdit::reloadSettings() { // Set syntax highlighting settings - sqlLexer->setDefaultColor(Qt::black); QFont defaultfont(PreferencesDialog::getSettingsValue("editor", "font").toString()); defaultfont.setStyleHint(QFont::TypeWriter); defaultfont.setPointSize(PreferencesDialog::getSettingsValue("editor", "fontsize").toInt()); + sqlLexer->setColor(Qt::black, QsciLexerSQL::Default); sqlLexer->setFont(defaultfont); setupSyntaxHighlightingFormat("comment", QsciLexerSQL::Comment); setupSyntaxHighlightingFormat("comment", QsciLexerSQL::CommentLine);