Fix mangled fonts in script editors

nyalldawson · nyalldawson · commit ea9d5bb36359 · 2018-11-05T10:35:18.000+10:00
Don't override default font letter spacing or stretch -- it's not safe to do because the results are very dependent on the individual font's appearance and rendering hints. Fixes #20349
diff --git a/python/plugins/db_manager/sqledit.py b/python/plugins/db_manager/sqledit.py
@@ -107,8 +107,6 @@ def setCommonOptions(self):
         self.defaultFont.setFixedPitch(True)
         self.defaultFont.setPointSize(fontSize)
         self.defaultFont.setStyleHint(QFont.TypeWriter)
-        self.defaultFont.setStretch(QFont.SemiCondensed)
-        self.defaultFont.setLetterSpacing(QFont.PercentageSpacing, 87.0)
         self.defaultFont.setBold(False)
 
         self.boldFont = QFont(self.defaultFont)
diff --git a/python/plugins/processing/script/ScriptEdit.py b/python/plugins/processing/script/ScriptEdit.py
@@ -62,7 +62,7 @@ class ScriptEdit(QsciScintilla):
     FOLD_COLOR = "#efefef"
 
     def __init__(self, parent=None):
-        QsciScintilla.__init__(self, parent)
+        super().__init__(parent)
 
         self.lexer = None
         self.api = None
@@ -128,7 +128,7 @@ def setCommonOptions(self):
         self.setTabWidth(4)
         self.setIndentationGuides(True)
 
-        # Autocomletion
+        # Autocompletion
         self.setAutoCompletionThreshold(2)
         self.setAutoCompletionSource(QsciScintilla.AcsAPIs)
 
@@ -145,8 +145,6 @@ def setFonts(self, size):
         self.defaultFont.setFixedPitch(True)
         self.defaultFont.setPointSize(fontSize)
         self.defaultFont.setStyleHint(QFont.TypeWriter)
-        self.defaultFont.setStretch(QFont.SemiCondensed)
-        self.defaultFont.setLetterSpacing(QFont.PercentageSpacing, 87.0)
         self.defaultFont.setBold(False)
 
         self.boldFont = QFont(self.defaultFont)
diff --git a/src/gui/qgscodeeditor.cpp b/src/gui/qgscodeeditor.cpp
@@ -178,8 +178,6 @@ QFont QgsCodeEditor::getMonospaceFont()
   font.setFixedPitch( true );
   font.setPointSize( fontSize );
   font.setStyleHint( QFont::TypeWriter );
-  font.setStretch( QFont::SemiCondensed );
-  font.setLetterSpacing( QFont::PercentageSpacing, 87.0 );
   font.setBold( false );
   return font;
 }

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,6 @@ QFont QgsCodeEditor::getMonospaceFont()`
`178`	`178`	`font.setFixedPitch( true );`
`179`	`179`	`font.setPointSize( fontSize );`
`180`	`180`	`font.setStyleHint( QFont::TypeWriter );`
`181`		`- font.setStretch( QFont::SemiCondensed );`
`182`		`- font.setLetterSpacing( QFont::PercentageSpacing, 87.0 );`
`183`	`181`	`font.setBold( false );`
`184`	`182`	`return font;`
`185`	`183`	`}`