Merge branch 'main' into dev

2021-02-08 17:35:41 +01:00
parent ac9345419e 2e94104ff8
commit 98fae8a6de
8 changed files with 43 additions and 12 deletions
@@ -203,14 +203,17 @@ class GuiTheme:
        return

    def updateFont(self):
-        """Updated the GUI's font style from settings,
+        """Update the GUI's font style from settings.
        """
        theFont = QFont()
        if self.mainConf.guiFont not in self.guiFontDB.families():
            if self.mainConf.osWindows:
-                # On Windows, default to Cantarell provided by novelWriter
-                theFont.setFamily("Cantarell")
-                theFont.setPointSize(11)
+                if "Arial" in self.guiFontDB.families():
+                    theFont.setFamily("Arial")
+                else:
+                    # On Windows, fall back to Cantarell provided by novelWriter
+                    theFont.setFamily("Cantarell")
+                theFont.setPointSize(10)
            else:
                theFont = self.guiFontDB.systemFont(QFontDatabase.GeneralFont)
            self.mainConf.guiFont = theFont.family()