UI|Default Style|Widgets: Slightly smaller monospace font on Windows

skyjake · Jan 21, 2017 · 1e16231 · 1e16231
1 parent 4065200
commit 1e16231
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei b/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei
@@ -167,3 +167,14 @@ slider {
 log {
     font normal inherits default {}
 }
+
+document {
+    font monospace inherits monospace {}
+}
+
+script {
+    # Make monospace a bit smaller on Windows - Courier New is pretty wide.
+    if Version.OS == 'windows'
+        document.monospace.size = '9pt'
+    end
+}
diff --git a/doomsday/sdk/libappfw/src/style.cpp b/doomsday/sdk/libappfw/src/style.cpp
@@ -190,7 +190,7 @@ Font const *Style::richStyleFont(Font::RichFormat::Style fontStyle) const
     switch (fontStyle)
     {
     case Font::RichFormat::Monospace:
-        return &fonts().font("monospace");
+        return &fonts().font(QStringLiteral("monospace"));
 
     default:
         return nullptr;

diff --git a/doomsday/sdk/libappfw/src/widgets/documentwidget.cpp b/doomsday/sdk/libappfw/src/widgets/documentwidget.cpp
@@ -125,6 +125,10 @@ public Font::RichFormat::IStyle
 
     Font const *richStyleFont(Font::RichFormat::Style fontStyle) const
     {
+        if (fontStyle == Font::RichFormat::Monospace)
+        {
+            return &style().fonts().font(QStringLiteral("document.monospace"));
+        }
         return style().richStyleFont(fontStyle);
     }