Font menu: show font names with their own font

frontend/ui/widget/textwidget.lua

@@ -36,6 +36,12 @@ local TextWidget = Widget:new{
     truncate_with_ellipsis = true, -- when truncation at max_width needed, add "…"
     truncate_left = false, -- truncate on the right by default
 
+    -- Force a baseline and height to use instead of those obtained from the font used
+    -- (mostly only useful for TouchMenu to display font names in their own font, to
+    -- ensure they get correctly vertically aligned in the menu)
+    forced_baseline = nil,
+    forced_height = nil,
+
     -- for internal use
     _updated = nil,
     _face_adjusted = nil,
@@ -279,7 +285,7 @@ function TextWidget:getSize()
     self:updateSize()
     return Geom:new{
         w = self._length,
-        h = self._height,
+        h = self.forced_height or self._height,
     }
 end
 
@@ -338,7 +344,7 @@ function TextWidget:paintTo(bb, x, y)
         text_width = self.max_width
     end
     local pen_x = 0
-    local baseline = self._baseline_h
+    local baseline = self.forced_baseline or self._baseline_h
     for i, xglyph in ipairs(self._xshaping) do
         if pen_x >= text_width then
             break

frontend/ui/widget/touchmenu.lua

@@ -88,6 +88,23 @@ function TouchMenuItem:init()
     -- FrameContainer default paddings minus the checked widget width
     local text_max_width = self.dimen.w - 2*Size.padding.default - checked_widget:getSize().w
     local text = getMenuText(self.item)
+    local face = self.face
+    local forced_baseline, forced_height
+    if self.item.font_func then
+        -- A font_func() may be provided by ReaderFont to have each font name
+        -- displayed in its own font: we must tell TextWidget to use the default
+        -- font baseline and height for items to be correctly aligned without
+        -- variations due to each font different metrics.
+        face = self.item.font_func(self.face.orig_size)
+        if face then
+            local w = TextWidget:new{ text = "", face = self.face }
+            forced_baseline = w:getBaseline()
+            forced_height = w:getSize().h
+            w:free()
+        else
+            face = self.face
+        end
+    end
     self.item_frame = FrameContainer:new{
         width = self.dimen.w,
         bordersize = 0,
@@ -102,7 +119,9 @@ function TouchMenuItem:init()
                 text = text,
                 max_width = text_max_width,
                 fgcolor = item_enabled ~= false and Blitbuffer.COLOR_BLACK or Blitbuffer.COLOR_DARK_GRAY,
-                face = self.face,
+                face = face,
+                forced_baseline = forced_baseline,
+                forced_height = forced_height,
             },
         },
     }