fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2025-12-29 19:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'label-freetype-font-fixes' into 'main'

Browse source 
plugins: label-freetype: Fix alignment and calculation of line width

See merge request plymouth/plymouth!204
This commit is contained in:
Ray Strode 2022-10-20 16:45:37 +00:00
commit 4bd41a355f
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/plugins/controls/label-freetype/plugin.c
View file

@ -157,19 +157,23 @@ width_of_line (ply_label_plugin_control_t *label,
const char *text) const char *text)
{ {
FT_Int width = 0; FT_Int width = 0;
FT_Int last_left = 0; FT_Int left_bearing = 0;
while (*text != '\0' && *text != '\n') { while (*text != '\0' && *text != '\n') {
if (FT_Load_Char (label->face, *text, FT_LOAD_RENDER)) if(FT_Load_Char (label->face, *text, FT_LOAD_RENDER | FT_LOAD_TARGET_LIGHT))
continue; continue;
width += label->face->glyph->advance.x >> 6; width += label->face->glyph->advance.x >> 6;
last_left = label->face->glyph->bitmap_left; left_bearing = label->face->glyph->bitmap_left;
/* We don't "go back" when drawing, so when left bearing is
* negative (like for 'j'), we simply add to the width. */
if (left_bearing < 0)
width += -left_bearing;
++text; ++text;
} }
return width + last_left; return width;
} }
static void static void
@ -314,22 +318,34 @@ draw_control (ply_label_plugin_control_t *label,
/* Start at start position (alignment) */ /* Start at start position (alignment) */
if (label->alignment == PLY_LABEL_ALIGN_CENTER) if (label->alignment == PLY_LABEL_ALIGN_CENTER)
pen.x += (label->width - width_of_line (label, cur_c)) << 5; pen.x += (label->area.width - width_of_line (label, cur_c)) << 5;
else if (label->alignment == PLY_LABEL_ALIGN_RIGHT) else if (label->alignment == PLY_LABEL_ALIGN_RIGHT)
pen.x += (label->width - width_of_line (label, cur_c)) << 6; pen.x += (label->area.width - width_of_line (label, cur_c)) << 6;
while (*cur_c && *cur_c != '\n') { while (*cur_c && *cur_c != '\n') {
FT_Int extraAdvance = 0, positiveBearingX = 0;
/* TODO: Unicode support. */ /* TODO: Unicode support. */
error = FT_Load_Char (label->face, *cur_c, error = FT_Load_Char (label->face, *cur_c,
FT_LOAD_RENDER | FT_LOAD_TARGET_LIGHT); FT_LOAD_RENDER | FT_LOAD_TARGET_LIGHT);
if (error) if (error)
continue; continue;
/* We consider negative left bearing an increment in size,
* as we draw full character boxes and don't "go back" in
* this plugin. Positive left bearing is treated as usual.
* For definitions see
* https://freetype.org/freetype2/docs/glyphs/glyphs-3.html
*/
if (slot->bitmap_left < 0) {
extraAdvance = -slot->bitmap_left;
} else {
positiveBearingX = slot->bitmap_left;
}
draw_bitmap (label, target, target_size, &slot->bitmap, draw_bitmap (label, target, target_size, &slot->bitmap,
(pen.x >> 6) + slot->bitmap_left, (pen.x >> 6) + positiveBearingX,
(pen.y >> 6) - slot->bitmap_top); (pen.y >> 6) - slot->bitmap_top);
pen.x += slot->advance.x; pen.x += slot->advance.x + extraAdvance;
pen.y += slot->advance.y; pen.y += slot->advance.y;
++cur_c; ++cur_c;