Merge branch 'release'

vkbo · May 1, 2024 · aa7208b · aa7208b
2 parents ea0b61a + 0092b3e
commit aa7208b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py
@@ -334,7 +334,7 @@ def initEditor(self) -> None:
         font = QFont()
         font.setFamily(CONFIG.textFont)
         font.setPointSize(CONFIG.textSize)
-        self.setFont(font)
+        self._qDocument.setDefaultFont(font)
 
         # Set default text margins
         # Due to cursor visibility, a part of the margin must be

diff --git a/novelwriter/gui/docviewer.py b/novelwriter/gui/docviewer.py
@@ -146,7 +146,7 @@ def initViewer(self) -> None:
         font = QFont()
         font.setFamily(CONFIG.textFont)
         font.setPointSize(CONFIG.textSize)
-        self.setFont(font)
+        self.document().setDefaultFont(font)
 
         # Set the widget colours to match syntax theme
         mainPalette = self.palette()

diff --git a/novelwriter/tools/manussettings.py b/novelwriter/tools/manussettings.py
@@ -27,13 +27,13 @@
 
 from typing import TYPE_CHECKING
 
-from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
 from PyQt5.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot
+from PyQt5.QtGui import QFont, QIcon, QSyntaxHighlighter, QTextCharFormat, QTextDocument
 from PyQt5.QtWidgets import (
-    QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox,
-    QFontDialog, QFrame, QGridLayout, QHBoxLayout, QHeaderView, QLabel,
-    QLineEdit, QMenu, QPlainTextEdit, QPushButton, QSplitter, QStackedWidget,
-    QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
+    QAbstractButton, QAbstractItemView, QDialog, QDialogButtonBox, QFontDialog,
+    QFrame, QGridLayout, QHBoxLayout, QHeaderView, QLabel, QLineEdit, QMenu,
+    QPlainTextEdit, QPushButton, QSplitter, QStackedWidget, QTreeWidget,
+    QTreeWidgetItem, QVBoxLayout, QWidget
 )
 
 from novelwriter import CONFIG, SHARED
@@ -1060,8 +1060,6 @@ class _FormatTab(NScrollableForm):
     def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings) -> None:
         super().__init__(parent=buildMain)
 
-        self.buildMain = buildMain
-
         self._build = build
         self._unitScale = 1.0