use standard font size

Author: ranfdev

Cargo.toml

@@ -10,6 +10,7 @@ edition = "2021"
 [dependencies.gtk]
 package = "gtk4"
 git = "https://github.com/gtk-rs/gtk4-rs.git"
+features = ["v4_6"]
 
 [dependencies]
 async-net = "1.4.7"

src/config.rs

@@ -1,3 +1,5 @@
+// Not sure if I want to keep this
+
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 
@@ -14,7 +16,6 @@ pub static DEFAULT_CONFIG: Lazy<Config> = Lazy::new(|| Config {
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct Font {
     pub family: String,
-    pub size: i32,
     pub weight: i32,
 }
 
@@ -31,31 +32,27 @@ impl Fonts {
     pub fn default_heading() -> Font {
         Font {
             family: String::from("Cantarell"),
-            size: 18,
             weight: 800,
         }
     }
 
     pub fn default_preformatted() -> Font {
         Font {
             family: String::from("monospace"),
-            size: 13,
             weight: 500,
         }
     }
 
     pub fn default_quote() -> Font {
         Font {
             family: String::from("Cantarell"),
-            size: 13,
             weight: 500,
         }
     }
 
     pub fn default_paragraph() -> Font {
         Font {
             family: String::from("Cantarell"),
-            size: 13,
             weight: 500,
         }
     }

src/draw_ctx.rs

@@ -35,7 +35,8 @@ impl DrawCtx {
                 .or_else(|| default_config.fonts.heading.as_ref())
                 .unwrap()
         });
-        tag_h1.set_size_points(tag_h1.size_points() * 1.4);
+        tag_h1.set_scale(2.0);
+        tag_h1.set_sentence(true);
 
         let tag_h2 = DrawCtx::create_tag("h2", {
             self.config
@@ -45,7 +46,8 @@ impl DrawCtx {
                 .or_else(|| default_config.fonts.heading.as_ref())
                 .unwrap()
         });
-        tag_h1.set_size_points(tag_h1.size_points() * 1.2);
+        tag_h2.set_scale(1.5);
+        tag_h1.set_sentence(true);
 
         let tag_h3 = DrawCtx::create_tag(
             "h3",
@@ -56,6 +58,9 @@ impl DrawCtx {
                 .or_else(|| default_config.fonts.heading.as_ref())
                 .unwrap(),
         );
+        tag_h2.set_scale(1.4);
+        tag_h1.set_sentence(true);
+
         let tag_p = DrawCtx::create_tag(
             "p",
             self.config
@@ -111,7 +116,6 @@ impl DrawCtx {
     pub fn create_tag(name: &str, config: &crate::config::Font) -> gtk::TextTag {
         gtk::builders::TextTagBuilder::new()
             .family(&config.family)
-            .size_points(config.size as f64)
             .weight(config.weight)
             .name(name)
             .build()
@@ -178,7 +182,6 @@ impl DrawCtx {
 
         let tag = gtk::builders::TextTagBuilder::new()
             .family(&config.family)
-            .size_points(config.size as f64)
             .weight(config.weight)
             .build();