Changeset b433f68 in mainline for uspace/lib/ui/src

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.

Location:

uspace/lib/ui/src

Files:

• checkbox.c (modified) (2 diffs)
• entry.c (modified) (1 diff)
• label.c (modified) (1 diff)
• pbutton.c (modified) (2 diffs)
• rbutton.c (modified) (1 diff)
• wdecor.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;

uspace/lib/ui/src/entry.c

@@ -208 +208 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.color = entry->res->entry_fg_color;
         fmt.halign = entry->halign;
         fmt.valign = gfx_valign_top;
-
-        rc = gfx_set_color(entry->res->gc, entry->res->entry_fg_color);
-        if (rc != EOK)
-                goto error;
 
         rc = gfx_puttext(entry->res->font, &pos, &fmt, entry->text);

uspace/lib/ui/src/label.c

@@ -193 +193 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.color = label->res->wnd_text_color;
         fmt.halign = label->halign;
         fmt.valign = gfx_valign_top;
-
-        rc = gfx_set_color(label->res->gc, label->res->wnd_text_color);
-        if (rc != EOK)
-                goto error;
 
         rc = gfx_puttext(label->res->font, &pos, &fmt, label->text);

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;

uspace/lib/ui/src/rbutton.c

@@ -274 +274 @@
         /* Paint rbutton label */
 
-        rc = gfx_set_color(rbutton->group->res->gc,
-            rbutton->group->res->wnd_text_color);
-        if (rc != EOK)
-                goto error;
-
-        /* Label position */
         pos.x = center.x + rbutton_oframe_r + rbutton_label_margin;
         pos.y = center.y;
 
         gfx_text_fmt_init(&fmt);
+        fmt.color = rbutton->group->res->wnd_text_color;
         fmt.halign = gfx_halign_left;
         fmt.valign = gfx_valign_center;

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);