Changeset b433f68 in mainline for uspace/lib/ui/src/checkbox.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/checkbox.c (modified) (2 diffs)

uspace/lib/ui/src/checkbox.c

@@ -192 +192 @@
 
                 gfx_text_fmt_init(&fmt);
+                fmt.color = checkbox->res->entry_fg_color;
                 fmt.halign = gfx_halign_center;
                 fmt.valign = gfx_valign_center;
-
-                rc = gfx_set_color(checkbox->res->gc,
-                    checkbox->res->entry_fg_color);
-                if (rc != EOK)
-                        goto error;
 
                 rc = gfx_puttext(checkbox->res->font, &box_center, &fmt, "X");
@@ -207 +203 @@
         /* Paint checkbox label */
 
-        rc = gfx_set_color(checkbox->res->gc, checkbox->res->wnd_text_color);
-        if (rc != EOK)
-                goto error;
-
-        /* Label position */
         pos.x = box_rect.p1.x + checkbox_label_margin;
         pos.y = (box_rect.p0.y + box_rect.p1.y) / 2;
 
         gfx_text_fmt_init(&fmt);
+        fmt.color = checkbox->res->wnd_text_color;
         fmt.halign = gfx_halign_left;
         fmt.valign = gfx_valign_center;