Merge pull request #188 from toolstack/fix-mono-zooming

Fix mono zooming

Author: toolstack

data/app.metainfo.xml.in

@@ -37,6 +37,7 @@
 			<li>Fixed deleting notebooks when duplicates in the trash already exist</li>
 			<li>Fixed zero size trash items not displaying</li>
 			<li>Fixed crash when opening notes from the command line (or Gnome Search)</li>
+			<li>Fixed zooming of monospace fonts</li>
 			<li>Removed selection of the text in the rename box automatically</li>
 			<li>Moved to Gnome 47 runtime (thanks @drpetrikov)</li>
 			<li>Moved to newer Gnome widgets (thanks @turlegarden)</li>

src/application.vala

@@ -194,6 +194,7 @@ Sunniva Løvstad
 			<li>Fixed deleting notebooks when duplicates in the trash already exist</li>
 			<li>Fixed zero size trash items not displaying</li>
 			<li>Fixed crash when opening notes from the command line (or Gnome Search)</li>
+			<li>Fixed zooming of monospace fonts</li>
 			<li>Removed selection of the text in the rename box automatically</li>
 			<li>Moved to Gnome 47 runtime (thanks @drpetrikov)</li>
 			<li>Moved to newer Gnome widgets (thanks @turlegarden)</li>

src/ui/edit_view/edit_view.vala

@@ -164,13 +164,14 @@ public class Folio.EditView : Gtk.Box {
 		scrolled_window.get_vscrollbar ().margin_top = 48;
 
 		settings.bind ("toolbar-enabled", this, "toolbar-enabled", SettingsBindFlags.DEFAULT);
-		settings.bind ("note-font-monospace", markdown_view, "font-monospace", SettingsBindFlags.DEFAULT);
 		settings.bind ("url-detection-level", markdown_view, "url-detection-level", SettingsBindFlags.DEFAULT);
 		settings.changed["note-font"].connect(() => set_note_font (settings.get_string ("note-font"), settings.get_string ("line-spacing")));
 		settings.changed["line-spacing"].connect(() => set_note_font (settings.get_string ("note-font"), settings.get_string ("line-spacing")));
 		settings.changed["note-max-width"].connect(() => set_max_width (settings.get_int ("note-max-width")));
 
 		var window_state = new Settings (@"$(Config.APP_ID).WindowState");
+		var prefs_scale = window_state.get_int ("text-scale");
+		scale = prefs_scale;
 		window_state.bind ("text-scale", this, "scale", SettingsBindFlags.DEFAULT);
 
 		notify["toolbar-enabled"].connect (update_toolbar_visibility);
@@ -400,6 +401,7 @@ public class Folio.EditView : Gtk.Box {
 	public void set_font_scale () {
 		font_scale_provider.load_from_string (@"textview{font-size:$(scale / 100f)em;}");
 		markdown_view.get_style_context ().add_provider (font_scale_provider, -1);
+		markdown_view.scale = scale;
 	}
 
 	private void set_note_font (string font, string line_spacing) {

src/ui/widgets/markdown/markdown_view.vala

@@ -8,6 +8,10 @@ public class GtkMarkdown.View : GtkSource.View {
 	public string font_monospace { get; set; default = "Monospace 10"; }
 	public int url_detection_level { get; set; default = 0; }
 
+	private int base_font_monospace_size { get; set; default = 10; }
+
+	public int scale { get; set; default = 100; }
+
 	public Gdk.RGBA h6_color {
 		get {
 			var rgba = get_color ();
@@ -439,24 +443,32 @@ public class GtkMarkdown.View : GtkSource.View {
 			}
 		}
 
+		var settings = new Settings (Config.APP_ID);
+		var prefs_font_monospace = settings.get_string ("note-font-monospace");
+		if (prefs_font_monospace != font_monospace) {
+			font_monospace = prefs_font_monospace;
+		}
+
+		settings.changed["note-font-monospace"].connect(() => change_font ());
+
+		var window_state = new Settings (@"$(Config.APP_ID).WindowState");
+		var prefs_scale = window_state.get_int ("text-scale");
+
+		scale = prefs_scale;
+
 		notify["dark"].connect ((s, p) => update_color_scheme ());
 		notify["theme-color"].connect ((s, p) => update_color_scheme ());
 		notify["font-monospace"].connect ((s, p) => update_font ());
 		notify["url-detection-level"].connect ((s, p) => update_url_detection ());
 
 		var font_desc = Pango.FontDescription.from_string (font_monospace);
-		var font_size = font_desc.get_size ();
-		if (!font_desc.get_size_is_absolute ()) {
-			font_size = font_size / Pango.SCALE;
-		}
-		if (font_size < 3) {
-			font_desc.set_size (10 * Pango.SCALE);
-			font_monospace = font_desc.to_string ();
-		}
+		base_font_monospace_size = font_desc.get_size ();
 
 		update_color_scheme ();
 		update_font ();
 
+		notify["scale"].connect(update_scale);
+
 		{
 			var gutter = get_gutter (Gtk.TextWindowType.LEFT);
 			renderer = new GtkSource.GutterRendererText ();
@@ -608,17 +620,39 @@ public class GtkMarkdown.View : GtkSource.View {
 		}
 	}
 
-	private void update_font () {
-		var font_desc = Pango.FontDescription.from_string (font_monospace);
-		var font_size = font_desc.get_size ();
+	private int calculate_scaled_font_size (Pango.FontDescription font_desc) {
+		var font_size = base_font_monospace_size;
+
 		if (!font_desc.get_size_is_absolute ()) {
-			font_size = font_size / Pango.SCALE;
+			font_size = ((font_size / Pango.SCALE) * scale ) / 100;
 		}
-		if (font_size < 3) {
-			font_desc.set_size (10 * Pango.SCALE);
-			font_monospace = font_desc.to_string ();
+
+		if (font_size < 4) { font_size = 4; }
+
+		return font_size;
+	}
+
+	private void update_scale () {
+		var font_desc = Pango.FontDescription.from_string (font_monospace);
+		var font_size = calculate_scaled_font_size (font_desc);
+
+		font_desc.set_size (font_size * Pango.SCALE);
+		font_monospace = font_desc.to_string ();
+	}
+
+	private void change_font () {
+		var settings = new Settings (Config.APP_ID);
+		var prefs_font_monospace = settings.get_string ("note-font-monospace");
+		if (prefs_font_monospace != font_monospace) {
+			font_monospace = prefs_font_monospace;
 		}
 
+		update_font ();
+	}
+
+	private void update_font () {
+		update_scale ();
+
 		text_tag_around = get_or_create_tag ("markdown-code-block-around");
 		text_tag_around.font = font_monospace;