Use font pt provided by user without scaling (unless fullscreen)

kmwallio · Oct 18, 2020 · f1d4e64 · f1d4e64
1 parent 832df7b
commit f1d4e64
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/data/com.github.kmwallio.thiefmd.gschema.xml b/data/com.github.kmwallio.thiefmd.gschema.xml
@@ -171,7 +171,7 @@
             <description>Font Family for editor to use</description>
         </key>
         <key name="font-size" type="i">
-            <default>12</default>
+            <default>14</default>
             <summary>Font Size to use</summary>
             <description>Font Size for editor to use</description>
         </key>

diff --git a/src/Constants/ThiefProperties.vala b/src/Constants/ThiefProperties.vala
@@ -97,17 +97,17 @@ The `markdown` editor worth stealing. *Focus* more on **writing**.
       
       .small-text {
           %s;
-          font-size: %0.2frem;
+          font-size: %dpt;
       }
       
       .focus-text {
           %s;
-          font-size: %0.2frem;
+          font-size: %dpt;
       }
       
       .full-text {
           %s;
-          font-size: %0.2frem;
+          font-size: %dpt;
       }""";
 
         public const string DYNAMIC_CSS = """@define-color colorPrimary %s;

diff --git a/src/Controllers/UI.vala b/src/Controllers/UI.vala
@@ -210,9 +210,9 @@ namespace ThiefMD.Controllers.UI {
 
         // Assuming 12pt is 1rem, scale to original CSS based on that
         string new_font = ThiefProperties.FONT_SETTINGS.printf (
-            settings.get_css_font_family (), ((settings.get_css_font_size () / Constants.SIZE_1_REM_IN_PT) * 1.25),
-            settings.get_css_font_family (), ((settings.get_css_font_size () / Constants.SIZE_1_REM_IN_PT) * 1.35),
-            settings.get_css_font_family (), ((settings.get_css_font_size () / Constants.SIZE_1_REM_IN_PT) * 1.45)
+            settings.get_css_font_family (), (int)((settings.get_css_font_size ()) * 1),
+            settings.get_css_font_family (), (int)((settings.get_css_font_size ()) * 1.2),
+            settings.get_css_font_family (), (int)((settings.get_css_font_size ()) * 1.4)
         );
 
         try {