Changeset 4583015 in mainline for uspace/lib/ui/src/rbutton.c

Timestamp:

2022-03-07T16:10:44Z (2 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/rbutton.c (modified) (4 diffs)

uspace/lib/ui/src/rbutton.c

@@ -278 +278 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = rbutton->group->res->font;
         fmt.color = rbutton->group->res->wnd_text_color;
         fmt.halign = gfx_halign_left;
         fmt.valign = gfx_valign_center;
 
-        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
-            rbutton->caption);
+        rc = gfx_puttext(&pos, &fmt, rbutton->caption);
         if (rc != EOK)
                 goto error;
@@ -316 +316 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = rbutton->group->res->font;
         fmt.color = depressed ? rbutton->group->res->entry_act_bg_color :
             rbutton->group->res->wnd_text_color;
@@ -321 +322 @@
         fmt.valign = gfx_valign_top;
 
-        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
-            rbutton->group->selected == rbutton ? "(\u2022)" : "( )");
+        rc = gfx_puttext(&pos, &fmt, rbutton->group->selected == rbutton ?
+            "(\u2022)" : "( )");
         if (rc != EOK)
                 goto error;
@@ -332 +333 @@
         fmt.color = rbutton->group->res->wnd_text_color;
 
-        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
-            rbutton->caption);
+        rc = gfx_puttext(&pos, &fmt, rbutton->caption);
         if (rc != EOK)
                 goto error;