Changeset 4583015 in mainline for uspace/lib/ui/src/label.c

Timestamp:

2022-03-07T16:10:44Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ca2680d

Parents:

5c27e77

Message:

Add font to gfx_text_fmt_t

This is quite logical and saves us one argument that we need to pass to
all text formatting functions.

File:

• uspace/lib/ui/src/label.c (modified) (1 diff)

uspace/lib/ui/src/label.c

@@ -215 +215 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = label->res->font;
         fmt.color = label->res->wnd_text_color;
         fmt.halign = label->halign;
         fmt.valign = label->valign;
 
-        rc = gfx_puttext(label->res->font, &pos, &fmt, label->text);
+        rc = gfx_puttext(&pos, &fmt, label->text);
         if (rc != EOK)
                 goto error;