From 6a98b2dce9a403c61f72abb382189efc0dd94c2f Mon Sep 17 00:00:00 2001 From: poire-z Date: Sat, 25 Apr 2020 23:30:49 +0200 Subject: [PATCH] Text widgets, crengine: fix wrong vertical positioning (#6093) Noticable with nastaliq arabic fonts. bump crengine: fix wrong usage of Harfbuzz y_offset Same in TextWidget and TextBoxWidget --- base | 2 +- frontend/ui/widget/textboxwidget.lua | 2 +- frontend/ui/widget/textwidget.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/base b/base index d74120a1c..0494fab12 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit d74120a1c308f89cd002eeec93591d4ed80f693f +Subproject commit 0494fab12ed5bde4d6decb7dbb79e844c32c5ed7 diff --git a/frontend/ui/widget/textboxwidget.lua b/frontend/ui/widget/textboxwidget.lua index 928d1920d..1682becc4 100644 --- a/frontend/ui/widget/textboxwidget.lua +++ b/frontend/ui/widget/textboxwidget.lua @@ -793,7 +793,7 @@ function TextBoxWidget:_renderText(start_row_idx, end_row_idx) end self._bb:colorblitFrom(glyph.bb, xglyph.x0 + glyph.l + xglyph.x_offset, - y - glyph.t + xglyph.y_offset, + y - glyph.t - xglyph.y_offset, 0, 0, glyph.bb:getWidth(), glyph.bb:getHeight(), color) end end diff --git a/frontend/ui/widget/textwidget.lua b/frontend/ui/widget/textwidget.lua index 475452b43..1397cfd5f 100644 --- a/frontend/ui/widget/textwidget.lua +++ b/frontend/ui/widget/textwidget.lua @@ -348,7 +348,7 @@ function TextWidget:paintTo(bb, x, y) bb:colorblitFrom( glyph.bb, x + pen_x + glyph.l + xglyph.x_offset, - y + baseline - glyph.t + xglyph.y_offset, + y + baseline - glyph.t - xglyph.y_offset, 0, 0, glyph.bb:getWidth(), glyph.bb:getHeight(), self.fgcolor)