]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
ply-label: Set font before sizing label
authorRay Strode <rstrode@redhat.com>
Sat, 2 Dec 2023 22:18:10 +0000 (17:18 -0500)
committerRay Strode <rstrode@redhat.com>
Sat, 2 Dec 2023 23:14:42 +0000 (18:14 -0500)
This commit makes sure the right font is loaded before sizing the
label, so the size comes out correctly.

src/libply-splash-graphics/ply-label.c

index ecb794044693ec5e42df0561cf22b3acf88a7d38..5f7830872da34ca80397bb7676df12a5f576aee6 100644 (file)
@@ -151,6 +151,10 @@ ply_label_load_plugin (ply_label_t *label)
                 return false;
         }
 
+        if (label->font != NULL)
+                label->plugin_interface->set_font_for_control (label->control,
+                                                               label->font);
+
         if (label->text != NULL) {
                 if (label->rich_text == NULL) {
                         label->plugin_interface->set_text_for_control (label->control,
@@ -165,10 +169,6 @@ ply_label_load_plugin (ply_label_t *label)
                                                             label->alignment);
         label->plugin_interface->set_width_for_control (label->control,
                                                         label->width);
-        if (label->font != NULL)
-                label->plugin_interface->set_font_for_control (label->control,
-                                                               label->font);
-
         label->plugin_interface->set_color_for_control (label->control,
                                                         label->red,
                                                         label->green,