Changeset 4583015 in mainline for uspace/lib/ui/src/slider.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/slider.c (modified) (3 diffs)

uspace/lib/ui/src/slider.c

@@ -341 +341 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = slider->res->font;
         fmt.color = slider->res->wnd_text_color;
         fmt.halign = gfx_halign_left;
@@ -357 +358 @@
         buf[w * gcharsz] = '\0';
 
-        rc = gfx_puttext(slider->res->font, &pos, &fmt, buf);
+        rc = gfx_puttext(&pos, &fmt, buf);
         free(buf);
         if (rc != EOK)
@@ -366 +367 @@
         pos.x += slider->pos;
 
-        rc = gfx_puttext(slider->res->font, &pos, &fmt,
-            "[O]");
+        rc = gfx_puttext(&pos, &fmt, "[O]");
         if (rc != EOK)
                 goto error;