Changeset 4583015 in mainline for uspace/app

Timestamp:

2022-03-07T16:10:44Z (4 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.

Location:

uspace/app

Files:

• edit/edit.c (modified) (2 diffs)
• fontedit/fontedit.c (modified) (2 diffs)
• gfxdemo/gfxdemo.c (modified) (13 diffs)
• nav/panel.c (modified) (4 diffs)

uspace/app/edit/edit.c

@@ -1259 +1259 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = font;
         fmt.color = pane->color;
 
@@ -1318 +1319 @@
                                         return rc;
 
-                                rc = gfx_puttext(font, &tpos, &fmt, cbuf);
+                                rc = gfx_puttext(&tpos, &fmt, cbuf);
                                 if (rc != EOK)
                                         return rc;

uspace/app/fontedit/fontedit.c

@@ -503 +503 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = fedit->font;
         fmt.color = color;
 
@@ -508 +509 @@
         pos.y = y;
 
-        return gfx_puttext(fedit->font, &pos, &fmt, str);
+        return gfx_puttext(&pos, &fmt, str);
 }
 

uspace/app/gfxdemo/gfxdemo.c

@@ -238 +238 @@
 
                 gfx_text_fmt_init(&fmt);
+                fmt.font = font;
                 fmt.color = color;
                 fmt.halign = gfx_halign_center;
@@ -244 +245 @@
                 pos.x = w / 2;
                 pos.y = h - 1;
-                rc = gfx_puttext(font, &pos, &fmt, text);
+                rc = gfx_puttext(&pos, &fmt, text);
                 if (rc != EOK) {
                         printf("Error rendering text.\n");
@@ -689 +690 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = font;
         fmt.color = color;
 
         pos.x = rect.p0.x;
         pos.y = rect.p0.y;
-        rc = gfx_puttext(font, &pos, &fmt, "Top left");
+        rc = gfx_puttext(&pos, &fmt, "Top left");
         if (rc != EOK) {
                 printf("Error rendering text.\n");
@@ -702 +704 @@
         pos.y = rect.p0.y;
         fmt.halign = gfx_halign_center;
-        rc = gfx_puttext(font, &pos, &fmt, "Top center");
+        rc = gfx_puttext(&pos, &fmt, "Top center");
         if (rc != EOK)
                 goto error;
@@ -709 +711 @@
         pos.y = rect.p0.y;
         fmt.halign = gfx_halign_right;
-        rc = gfx_puttext(font, &pos, &fmt, "Top right");
+        rc = gfx_puttext(&pos, &fmt, "Top right");
         if (rc != EOK)
                 goto error;
@@ -718 +720 @@
         pos.y = (rect.p0.y + rect.p1.y - 1) / 2;
         fmt.halign = gfx_halign_left;
-        rc = gfx_puttext(font, &pos, &fmt, "Center left");
+        rc = gfx_puttext(&pos, &fmt, "Center left");
         if (rc != EOK)
                 goto error;
@@ -725 +727 @@
         pos.y = (rect.p0.y + rect.p1.y - 1) / 2;
         fmt.halign = gfx_halign_center;
-        rc = gfx_puttext(font, &pos, &fmt, "Center");
+        rc = gfx_puttext(&pos, &fmt, "Center");
         if (rc != EOK)
                 goto error;
@@ -732 +734 @@
         pos.y = (rect.p0.y + rect.p1.y - 1) / 2;
         fmt.halign = gfx_halign_right;
-        rc = gfx_puttext(font, &pos, &fmt, "Center right");
+        rc = gfx_puttext(&pos, &fmt, "Center right");
         if (rc != EOK)
                 goto error;
@@ -741 +743 @@
         pos.y = rect.p1.y - 1;
         fmt.halign = gfx_halign_left;
-        rc = gfx_puttext(font, &pos, &fmt, "Bottom left");
+        rc = gfx_puttext(&pos, &fmt, "Bottom left");
         if (rc != EOK)
                 goto error;
@@ -748 +750 @@
         pos.y = rect.p1.y;
         fmt.halign = gfx_halign_center;
-        rc = gfx_puttext(font, &pos, &fmt, "Bottom center");
+        rc = gfx_puttext(&pos, &fmt, "Bottom center");
         if (rc != EOK)
                 goto error;
@@ -755 +757 @@
         pos.y = rect.p1.y;
         fmt.halign = gfx_halign_right;
-        rc = gfx_puttext(font, &pos, &fmt, "Bottom right");
+        rc = gfx_puttext(&pos, &fmt, "Bottom right");
         if (rc != EOK)
                 goto error;
@@ -762 +764 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = font;
 
         for (i = 0; i < 8; i++) {
@@ -780 +783 @@
                 pos.x = w / 20;
                 pos.y = (6 + i) * h / 15;
-                rc = gfx_puttext(font, &pos, &fmt, "The quick brown fox jumps over the lazy dog.");
+                rc = gfx_puttext(&pos, &fmt, "The quick brown fox jumps over the lazy dog.");
                 if (rc != EOK)
                         goto error;

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