fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-06 05:38:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

label-freetype: Fix rowstride bug with hidpi displays

Browse source 
The freetype plugin correctly doubles the DPI on hidpi displays,
but fails to account for the doubled pixels in display's pixel buffer.

This commit adds a factor of 2 to the size and positioncomputations,
to hopefully fix a row stride and a positioning bug.
This commit is contained in:
Ray Strode 2024-01-03 16:24:50 -05:00
parent 2dba038dd7
commit 1c2c9e622d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -429,13 +429,13 @@ finish_measuring_line (ply_label_plugin_control_t *label,
line_height.as_integer = label->face->size->metrics.ascender + -label->face->size->metrics.descender;
dimensions->x = label->area.x;
dimensions->x = label->area.x * label->scale_factor;
dimensions->width = glyph_x->as_pixels_unit.pixels - dimensions->x;
label->area.width = MAX (label->area.width, dimensions->width);
label->area.width = MAX (label->area.width, dimensions->width / label->scale_factor);
dimensions->height = line_height.as_pixels_unit.pixels;
label->area.height += dimensions->height;
label->area.height += dimensions->height / label->scale_factor;
entry = calloc (1, sizeof(ply_rectangle_t));
*entry = *dimensions;
@ -459,6 +459,7 @@ align_lines (ply_label_plugin_control_t *label)
return;
width = label->width > 0? label->width : label->area.width;
width *= label->scale_factor;
dimensions_of_lines = (ply_rectangle_t **) ply_array_get_pointer_elements (label->dimensions_of_lines);
@ -482,8 +483,8 @@ load_glyphs (ply_label_plugin_control_t *label,
ply_utf8_string_iterator_t utf8_string_iterator;
uint32_t *target = NULL;
ply_rectangle_t target_size;
ply_freetype_unit_t glyph_x = { .as_pixels_unit = { .pixels = label->area.x } };
ply_freetype_unit_t glyph_y = { .as_pixels_unit = { .pixels = label->area.y } };
ply_freetype_unit_t glyph_x = { .as_pixels_unit = { .pixels = label->area.x * label->scale_factor } };
ply_freetype_unit_t glyph_y = { .as_pixels_unit = { .pixels = label->area.y * label->scale_factor } };
FT_Error error;
FT_UInt previous_glyph_index = 0;
bool is_first_character = true;
@ -510,8 +511,8 @@ load_glyphs (ply_label_plugin_control_t *label,
clear_dimensions_of_lines (label);
line_dimensions = alloca (sizeof(ply_rectangle_t));
line_dimensions->x = label->area.x;
line_dimensions->y = label->area.y;
line_dimensions->x = label->area.x * label->scale_factor;
line_dimensions->y = label->area.y * label->scale_factor;
line_dimensions->width = 0;
line_dimensions->height = 0;
label->area.width = 0;
@ -535,6 +536,9 @@ load_glyphs (ply_label_plugin_control_t *label,
if (target_size.height == 0)
return;
target_size.width *= label->scale_factor;
target_size.height *= label->scale_factor;
}
/* Go through each line */