Changeset 4583015 in mainline for uspace/lib/ui/src/wdecor.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/wdecor.c (modified) (3 diffs)

uspace/lib/ui/src/wdecor.c

@@ -242 +242 @@
 
                 gfx_text_fmt_init(&fmt);
+                fmt.font = wdecor->res->font;
                 fmt.color = wdecor->active ?
                     wdecor->res->tbar_act_text_color :
@@ -253 +254 @@
                 if (wdecor->res->textmode) {
                         /* Make space around caption text */
-                        gfx_text_rect(wdecor->res->font, &pos, &fmt,
-                            wdecor->caption, &text_rect);
+                        gfx_text_rect(&pos, &fmt, wdecor->caption, &text_rect);
 
                         /* Only make space if caption is non-empty */
@@ -273 +273 @@
                 }
 
-                rc = gfx_puttext(wdecor->res->font, &pos, &fmt, wdecor->caption);
+                rc = gfx_puttext(&pos, &fmt, wdecor->caption);
                 if (rc != EOK)
                         return rc;