Changeset b433f68 in mainline for uspace/lib/ui/src/pbutton.c

Timestamp:

2021-02-26T16:23:36Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

77ffa01

Parents:

fe40b67

Message:

Puttext needs to know the color of the text being printed

So far we were using the GC's current drawing color. But unless there
was a way to read it, we could not render text-mode text in the correct
color.

File:

• uspace/lib/ui/src/pbutton.c (modified) (2 diffs)

uspace/lib/ui/src/pbutton.c

@@ -269 +269 @@
                 goto error;
 
-        rc = gfx_set_color(pbutton->res->gc, pbutton->res->btn_text_color);
-        if (rc != EOK)
-                goto error;
-
         /* Center of button rectangle */
         pos.x = (rect.p0.x + rect.p1.x) / 2;
@@ -283 +279 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.color = pbutton->res->btn_text_color;
         fmt.halign = gfx_halign_center;
         fmt.valign = gfx_valign_center;