diff options
| author | Kaalleen <36401965+kaalleen@users.noreply.github.com> | 2025-10-10 10:25:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-10 10:25:49 +0200 |
| commit | 2c295ace644a27b7d1523c047e168aac2ead03dc (patch) | |
| tree | 436f73eb6b788c3ac68fdda3b1e15fac27a8eef0 /lib/gui/edit_json/settings_panel.py | |
| parent | 31cebe4228be707a1fe0a8727044fbc7271dd4b3 (diff) | |
Edit json: allow 0 values for horiz_adv_x_default (#3965)
* edit json: allow 0 values for horiz_adv_x_default and enable None for using the glyph width
* enable None value in generate json too
Diffstat (limited to 'lib/gui/edit_json/settings_panel.py')
| -rw-r--r-- | lib/gui/edit_json/settings_panel.py | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/lib/gui/edit_json/settings_panel.py b/lib/gui/edit_json/settings_panel.py index b4fd51d9..a16ac53a 100644 --- a/lib/gui/edit_json/settings_panel.py +++ b/lib/gui/edit_json/settings_panel.py @@ -201,7 +201,7 @@ class GeneralKerning(wx.Panel): wx.Panel.__init__(self, parent) sizer = wx.BoxSizer(wx.VERTICAL) - grid_sizer = wx.FlexGridSizer(20, 2, 10, 10) + grid_sizer = wx.FlexGridSizer(20, 3, 10, 10) grid_sizer.AddGrowableCol(1) size_label = wx.StaticText(self, label=_("Size")) @@ -236,6 +236,12 @@ class GeneralKerning(wx.Panel): wx.EVT_SPINCTRLDOUBLE, self.parent.on_horiz_adv_x_default_changed ) + self.horiz_adv_x_default_null_checkbox = wx.CheckBox(self, label=_("Glyph width")) + self.horiz_adv_x_default_null_checkbox.SetToolTip(_("Use the width of the individual glyphs.")) + self.horiz_adv_x_default_null_checkbox.Bind( + wx.EVT_CHECKBOX, + self.parent.on_horiz_adv_x_default_checkbox_changed + ) horiz_adv_x_space_label = wx.StaticText(self, label=_("Horizontal advance x space")) self.horiz_adv_x_space = wx.SpinCtrlDouble(self, min=0, max=10000, inc=0.1, initial=50, style=wx.SP_WRAP) self.horiz_adv_x_space.Bind( @@ -246,16 +252,27 @@ class GeneralKerning(wx.Panel): grid_sizer.AddMany([ (size_label, 0, wx.ALL, 0), (self.size, 1, wx.ALL | wx.EXPAND, 0), + (wx.StaticText(self), 1, wx.ALL | wx.EXPAND, 0), + (min_scale_label, 0, wx.ALL, 0), (self.min_scale, 1, wx.ALL | wx.EXPAND, 0), + (wx.StaticText(self), 1, wx.ALL | wx.EXPAND, 0), + (max_scale_label, 0, wx.ALL, 0), (self.max_scale, 1, wx.ALL | wx.EXPAND, 0), + (wx.StaticText(self), 1, wx.ALL | wx.EXPAND, 0), + (leading_label, 0, wx.ALL, 0), (self.leading, 1, wx.ALL | wx.EXPAND, 0), + (wx.StaticText(self), 1, wx.ALL | wx.EXPAND, 0), + (horiz_adv_x_default_label, 0, wx.ALL, 0), (self.horiz_adv_x_default, 1, wx.ALL | wx.EXPAND, 0), + (self.horiz_adv_x_default_null_checkbox, 1, wx.ALL | wx.EXPAND, 0), + (horiz_adv_x_space_label, 0, wx.ALL, 0), - (self.horiz_adv_x_space, 1, wx.ALL | wx.EXPAND, 0) + (self.horiz_adv_x_space, 1, wx.ALL | wx.EXPAND, 0), + (wx.StaticText(self), 1, wx.ALL | wx.EXPAND, 0) ]) sizer.Add(grid_sizer, 1, wx.EXPAND | wx.ALL, 10) |