From a747f554236a949a2ab22f43f21c89101fb9fa19 Mon Sep 17 00:00:00 2001
From: Filippo Scognamiglio <flscogna@gmail.com>
Date: Sat, 17 Nov 2018 23:42:06 +0100
Subject: [PATCH] Make font sizes more consistent.

---
 app/qml/FontPixels.qml    | 12 ++++++------
 app/qml/FontScanlines.qml | 14 +++++++-------
 app/qml/Fonts.qml         |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/qml/FontPixels.qml b/app/qml/FontPixels.qml
index 91129b3..a22f897 100644
--- a/app/qml/FontPixels.qml
+++ b/app/qml/FontPixels.qml
@@ -38,7 +38,7 @@ QtObject{
             source: "fonts/1977-commodore-pet/PetMe.ttf"
             lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.8
         }
         ListElement{
@@ -47,7 +47,7 @@ QtObject{
             source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf"
             lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.8
         }
         ListElement{
@@ -56,7 +56,7 @@ QtObject{
             source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
             lineSpacing: 1
             pixelSize: 16
-            baseScaling: 4.0
+            baseScaling: 3.3
             fontWidth: 0.9
         }
         ListElement{
@@ -83,7 +83,7 @@ QtObject{
             source: "fonts/1977-apple2/PrintChar21.ttf"
             lineSpacing: 2
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.9
         }
         ListElement{
@@ -92,7 +92,7 @@ QtObject{
             source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf"
             lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.8
         }
         ListElement{
@@ -101,7 +101,7 @@ QtObject{
             source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf"
             lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.8
         }
     }
diff --git a/app/qml/FontScanlines.qml b/app/qml/FontScanlines.qml
index f60e4a6..b678d57 100644
--- a/app/qml/FontScanlines.qml
+++ b/app/qml/FontScanlines.qml
@@ -38,7 +38,7 @@ QtObject{
             source: "fonts/1977-commodore-pet/PetMe.ttf"
             lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.7
         }
         ListElement{
@@ -47,7 +47,7 @@ QtObject{
             source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf"
             lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.8
         }
         ListElement{
@@ -56,7 +56,7 @@ QtObject{
             source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
             lineSpacing: 1
             pixelSize: 16
-            baseScaling: 4.0
+            baseScaling: 3.3
             fontWidth: 0.9
         }
         ListElement{
@@ -81,9 +81,9 @@ QtObject{
             name: "APPLE_II"
             text: "Apple ][ (1977)"
             source: "fonts/1977-apple2/PrintChar21.ttf"
-            lineSpacing: 2
+            lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.8
         }
         ListElement{
@@ -92,7 +92,7 @@ QtObject{
             source: "fonts/1979-atari-400-800/AtariClassic-Regular.ttf"
             lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.7
         }
         ListElement{
@@ -101,7 +101,7 @@ QtObject{
             source: "fonts/1982-commodore64/C64_Pro_Mono-STYLE.ttf"
             lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.7
         }
     }
diff --git a/app/qml/Fonts.qml b/app/qml/Fonts.qml
index b839d3c..f4a6b96 100644
--- a/app/qml/Fonts.qml
+++ b/app/qml/Fonts.qml
@@ -108,7 +108,7 @@ QtObject{
             source: "fonts/modern-proggy-tiny/ProggyTiny.ttf"
             lineSpacing: 1
             pixelSize: 16
-            baseScaling: 3.0
+            baseScaling: 3.3
             fontWidth: 0.9
             lowResolutionFont: true
             isSystemFont: false
@@ -118,7 +118,7 @@ QtObject{
             name: "APPLE_II_SCALED"
             text: "Apple ][ (1977)"
             source: "fonts/1977-apple2/PrintChar21.ttf"
-            lineSpacing: 2
+            lineSpacing: 3
             pixelSize: 8
             baseScaling: 3.5
             fontWidth: 0.8
@@ -144,7 +144,7 @@ QtObject{
             source: "fonts/1981-ibm-pc/PxPlus_IBM_BIOS.ttf"
             lineSpacing: 3
             pixelSize: 8
-            baseScaling: 4.0
+            baseScaling: 3.5
             fontWidth: 0.8
             lowResolutionFont: true
             isSystemFont: false
@@ -179,7 +179,7 @@ QtObject{
             text: "HD: Hermit (Modern)"
             source: "fonts/modern-hermit/Hermit-medium.otf"
             lineSpacing: 0.05
-            pixelSize: 28
+            pixelSize: 27
             fontWidth: 1.0
             lowResolutionFont: false
             isSystemFont: false