From: Alfonso Sánchez-Beato <alfonso.sanchez-beato@canonical.com>
Date: Thu, 20 Oct 2022 10:37:14 +0000 (+0100)
Subject: plugins: label-freetype: Fix font alignment
X-Git-Tag: 23.51.283~69^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbf0fa7fc7520e33091d08ef7e8916e80ab8de30;p=thirdparty%2Fplymouth.git

plugins: label-freetype: Fix font alignment

label->width is used to calculate wrapping of lines and it is by
default -1. We need to use label->area.width instead when aligning a
line, as label->width might not have been set.
---

diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c
index bb29fc4c..ee66f46a 100644
--- a/src/plugins/controls/label-freetype/plugin.c
+++ b/src/plugins/controls/label-freetype/plugin.c
@@ -314,9 +314,9 @@ draw_control (ply_label_plugin_control_t *label,
 
                 /* Start at start position (alignment) */
                 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)
-                        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') {
                         /* TODO: Unicode support. */