From 1bd2dddab8c9e9b0188f11f2e36682ebc38d1629 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Tue, 20 May 2025 15:57:59 +0200
Subject: add force horiz_adv_x_default to generate json and fix edit-json
 (#3735)

---
 lib/gui/edit_json/main_panel.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/gui')

diff --git a/lib/gui/edit_json/main_panel.py b/lib/gui/edit_json/main_panel.py
index cd2657ab..bd43f523 100644
--- a/lib/gui/edit_json/main_panel.py
+++ b/lib/gui/edit_json/main_panel.py
@@ -517,7 +517,10 @@ class LetteringEditJsonPanel(wx.Panel):
         if horiz_adv_x_default in [0, None]:
             horiz_adv_x_default = glyph.width + glyph.min_x
 
-        position_x += self.font.horiz_adv_x.get(character, horiz_adv_x_default) - glyph.min_x
+        # in some rare cases, horiz_adv_x for a character returns None
+        # so we need to really ensure that the default is used in this case
+        horiz_adv_x = self.font.horiz_adv_x.get(character, horiz_adv_x_default) or horiz_adv_x_default
+        position_x += horiz_adv_x - glyph.min_x
 
         self.font._update_commands(node, glyph)
         self.font._update_clips(self.layer, node, glyph)
-- 
cgit v1.2.3