Changeset 4583015 in mainline for uspace/app/nav/panel.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/app/nav/panel.c (modified) (4 diffs)

uspace/app/nav/panel.c

@@ -175 +175 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = font;
         rows = panel_page_size(panel);
 
@@ -219 +220 @@
                 return rc;
 
-        rc = gfx_puttext(font, &pos, &fmt, entry->name);
+        rc = gfx_puttext(&pos, &fmt, entry->name);
         if (rc != EOK) {
                 (void) gfx_set_clip_rect(gc, NULL);
@@ -236 +237 @@
         gfx_context_t *gc = ui_window_get_gc(panel->window);
         ui_resource_t *res = ui_window_get_res(panel->window);
-        gfx_text_fmt_t fmt;
         panel_entry_t *entry;
         ui_box_style_t bstyle;
@@ -242 +242 @@
         int i, lines;
         errno_t rc;
-
-        gfx_text_fmt_init(&fmt);
 
         rc = gfx_set_color(gc, panel->color);