mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 02:50:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make ExtendedScintilla widget run without a lexer

Browse Source 
When using an ExtendedScintilla widget without setting a lexer, the
application would easily crash. This is improved by this commit.
This commit is contained in:
Martin Kleusberg
2019-02-21 13:33:56 +01:00
parent ee8f243623
commit 042e925f9f
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ExtendedScintilla.cpp
View File

@@ -90,8 +90,7 @@ void ExtendedScintilla::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();
setMarginWidth(0, QFontMetrics(font).width(QString("0").repeated(digits)) + 5);
setMarginWidth(0, QFontMetrics(font()).width(QString("0").repeated(digits)) + 5);
}
void ExtendedScintilla::dropEvent(QDropEvent* e)
@@ -147,13 +146,16 @@ void ExtendedScintilla::reloadSettings()
void ExtendedScintilla::reloadLexerSettings(QsciLexer *lexer)
{
// Set syntax highlighting settings
QFont defaultfont(Settings::getValue("editor", "font").toString());
defaultfont.setStyleHint(QFont::TypeWriter);
defaultfont.setPointSize(Settings::getValue("editor", "fontsize").toInt());
lexer->setFont(defaultfont);
if(lexer)
{
QFont defaultfont(Settings::getValue("editor", "font").toString());
defaultfont.setStyleHint(QFont::TypeWriter);
defaultfont.setPointSize(Settings::getValue("editor", "fontsize").toInt());
lexer->setFont(defaultfont);
lexer->setDefaultColor(QColor(Settings::getValue("syntaxhighlighter", "foreground_colour").toString()));
lexer->setPaper(QColor(Settings::getValue("syntaxhighlighter", "background_colour").toString()));
lexer->setDefaultColor(QColor(Settings::getValue("syntaxhighlighter", "foreground_colour").toString()));
lexer->setPaper(QColor(Settings::getValue("syntaxhighlighter", "background_colour").toString()));
}
// Set font
QFont font(Settings::getValue("editor", "font").toString());
@@ -162,11 +164,8 @@ void ExtendedScintilla::reloadLexerSettings(QsciLexer *lexer)
setFont(font);
// Show line numbers
QFont marginsfont(QFont(Settings::getValue("editor", "font").toString()));
marginsfont.setPointSize(font.pointSize());
setMarginsFont(marginsfont);
setMarginsFont(font);
setMarginLineNumbers(0, true);
updateLineNumberAreaWidth();
// Highlight current line
@@ -176,7 +175,8 @@ void ExtendedScintilla::reloadLexerSettings(QsciLexer *lexer)
// Set tab width
setTabWidth(Settings::getValue("editor", "tabsize").toInt());
lexer->refreshProperties();
if(lexer)
lexer->refreshProperties();
// Set wrap lines
setWrapMode(static_cast<QsciScintilla::WrapMode>(Settings::getValue("editor", "wrap_lines").toInt()));