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

Timestamp:

2021-02-26T16:23:36Z (3 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/wdecor.c (modified) (2 diffs)

uspace/lib/ui/src/wdecor.c

@@ -213 +213 @@
 
                 gfx_text_fmt_init(&fmt);
+                fmt.color = wdecor->active ?
+                    wdecor->res->tbar_act_text_color :
+                    wdecor->res->tbar_inact_text_color;
                 fmt.halign = gfx_halign_center;
                 fmt.valign = gfx_valign_center;
@@ -218 +221 @@
                 pos.x = (trect.p0.x + trect.p1.x) / 2;
                 pos.y = (trect.p0.y + trect.p1.y) / 2;
-
-                rc = gfx_set_color(wdecor->res->gc, wdecor->active ?
-                    wdecor->res->tbar_act_text_color :
-                    wdecor->res->tbar_inact_text_color);
-                if (rc != EOK)
-                        return rc;
 
                 rc = gfx_puttext(wdecor->res->font, &pos, &fmt, wdecor->caption);