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

Timestamp:

2022-03-07T16:10:44Z (3 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/entry.c (modified) (9 diffs)

uspace/lib/ui/src/entry.c

@@ -314 +314 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = res->font;
         fmt.color = res->entry_fg_color;
         fmt.halign = gfx_halign_left;
@@ -329 +330 @@
         entry->text[off1] = '\0';
 
-        rc = gfx_puttext(res->font, &pos, &fmt, entry->text);
+        rc = gfx_puttext(&pos, &fmt, entry->text);
         if (rc != EOK) {
                 (void) gfx_set_clip_rect(res->gc, NULL);
@@ -335 +336 @@
         }
 
-        gfx_text_cont(res->font, &pos, &fmt, entry->text, &cpos, &cfmt);
+        gfx_text_cont(&pos, &fmt, entry->text, &cpos, &cfmt);
         entry->text[off1] = c;
 
@@ -345 +346 @@
                 cfmt.color = res->entry_sel_text_fg_color;
 
-                gfx_text_rect(res->font, &cpos, &cfmt, entry->text + off1, &sel);
+                gfx_text_rect(&cpos, &cfmt, entry->text + off1, &sel);
                 sel.p0.x -= ui_entry_sel_hpad;
                 sel.p0.y -= ui_entry_sel_vpad;
@@ -359 +360 @@
                         goto error;
 
-                rc = gfx_puttext(res->font, &cpos, &cfmt, entry->text + off1);
+                rc = gfx_puttext(&cpos, &cfmt, entry->text + off1);
                 if (rc != EOK) {
                         (void) gfx_set_clip_rect(res->gc, NULL);
@@ -365 +366 @@
                 }
 
-                gfx_text_cont(res->font, &cpos, &cfmt, entry->text + off1,
-                    &cpos, &cfmt);
+                gfx_text_cont(&cpos, &cfmt, entry->text + off1, &cpos, &cfmt);
 
                 entry->text[off2] = c;
@@ -374 +374 @@
         cfmt.color = res->entry_fg_color;
 
-        rc = gfx_puttext(res->font, &cpos, &cfmt, entry->text + off2);
+        rc = gfx_puttext(&cpos, &cfmt, entry->text + off2);
         if (rc != EOK) {
                 (void) gfx_set_clip_rect(res->gc, NULL);
@@ -421 +421 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = res->font;
         fmt.halign = gfx_halign_left;
         fmt.valign = gfx_valign_top;
 
-        return gfx_text_find_pos(res->font, &geom.text_pos, &fmt,
-            entry->text, fpos);
+        return gfx_text_find_pos(&geom.text_pos, &fmt, entry->text, fpos);
 }
 
@@ -1111 +1111 @@
                 anchor.y = 0;
                 gfx_text_fmt_init(&fmt);
+                fmt.font = res->font;
                 fmt.halign = entry->halign;
-                gfx_text_start_pos(res->font, &anchor, &fmt, entry->text,
-                    &tpos);
+                gfx_text_start_pos(&anchor, &fmt, entry->text, &tpos);
                 entry->scroll_pos = tpos.x - geom.text_rect.p0.x;
         } else if (geom.text_pos.x + width < geom.text_rect.p1.x &&