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

uspace/lib/ui/src/paint.c

@@ -402 +402 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = resource->font;
         fmt.color = color;
 
@@ -427 +428 @@
 
         pos = rect->p0;
-        rc = gfx_puttext(resource->font, &pos, &fmt, str);
+        rc = gfx_puttext(&pos, &fmt, str);
         if (rc != EOK)
                 goto error;
@@ -436 +437 @@
 
                 pos.x = rect->p0.x;
-                rc = gfx_puttext(resource->font, &pos, &fmt,
-                    boxc->c[1][0]);
+                rc = gfx_puttext(&pos, &fmt, boxc->c[1][0]);
                 if (rc != EOK)
                         goto error;
 
                 pos.x = rect->p1.x - 1;
-                rc = gfx_puttext(resource->font, &pos, &fmt,
-                    boxc->c[1][2]);
+                rc = gfx_puttext(&pos, &fmt, boxc->c[1][2]);
                 if (rc != EOK)
                         goto error;
@@ -464 +463 @@
         pos.x = rect->p0.x;
         pos.y = rect->p1.y - 1;
-        rc = gfx_puttext(resource->font, &pos, &fmt, str);
+        rc = gfx_puttext(&pos, &fmt, str);
         if (rc != EOK)
                 goto error;
@@ -519 +518 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = resource->font;
         fmt.color = color;
 
@@ -542 +542 @@
 
         pos = rect->p0;
-        rc = gfx_puttext(resource->font, &pos, &fmt, str);
+        rc = gfx_puttext(&pos, &fmt, str);
         if (rc != EOK)
                 goto error;