Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix font matching style bug (#2503)

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2025-08-24 15:51:32 +02:00
committed by GitHub
parent d1c3584651 b484dd6f71
commit 23a0df61cd
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/common.py
+1
View File
@@ -445,6 +445,7 @@ def fontMatcher(font: QFont) -> QFont:
default Qt font matching algorithm doesn't handle well changing default Qt font matching algorithm doesn't handle well changing
application fonts at runtime. application fonts at runtime.
""" """
font.setStyleName(None) # Make sure no font style name is set from config, see #2502
info = QFontInfo(font) info = QFontInfo(font)
if (famRequest := font.family()) != (famActual := info.family()): if (famRequest := font.family()) != (famActual := info.family()):
logger.warning("Font mismatch: Requested '%s', but got '%s'", famRequest, famActual) logger.warning("Font mismatch: Requested '%s', but got '%s'", famRequest, famActual)
tests/test_base/test_base_common.py
+5
View File
@@ -537,6 +537,11 @@ def testBaseCommon_fontMatcher(monkeypatch):
nonsense = QFont("nonesense", 10) nonsense = QFont("nonesense", 10)
assert fontMatcher(nonsense) is nonsense assert fontMatcher(nonsense) is nonsense
# Style is reset
nonsense.setStyleName("blabla")
assert nonsense.styleName() == "blabla"
assert fontMatcher(nonsense).styleName() == ""
# General font # General font
if len(QFontDatabase.families()) > 1: if len(QFontDatabase.families()) > 1:
fontOne = QFont(QFontDatabase.families()[0]) fontOne = QFont(QFontDatabase.families()[0])