Changeset b433f68 in mainline for uspace/app/fontedit/fontedit.c

Timestamp:

2021-02-26T16:23:36Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

77ffa01

Parents:

fe40b67

Message:

Puttext needs to know the color of the text being printed

So far we were using the GC's current drawing color. But unless there
was a way to read it, we could not render text-mode text in the correct
color.

File:

• uspace/app/fontedit/fontedit.c (modified) (3 diffs)

uspace/app/fontedit/fontedit.c

@@ -446 +446 @@
  * @param fedit Font editor
  * @param x Starting X coordinate
- * @Param y Starting Y coordinate
+ * @param y Starting Y coordinate
+ * @param color Color
  * @param str String
  */
 static errno_t font_edit_paint_preview_str(font_edit_t *fedit,
-    gfx_coord_t x, gfx_coord_t y, const char *str)
+    gfx_coord_t x, gfx_coord_t y, gfx_color_t *color, const char *str)
 {
         gfx_text_fmt_t fmt;
@@ -456 +457 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.color = color;
 
         pos.x = x;
@@ -480 +482 @@
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 20,
+        rc = font_edit_paint_preview_str(fedit, 20, 20, color,
             "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
         if (rc != EOK)
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 40,
+        rc = font_edit_paint_preview_str(fedit, 20, 40, color,
             "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG");
         if (rc != EOK)
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 60,
+        rc = font_edit_paint_preview_str(fedit, 20, 60, color,
             "abcdefghijklmnopqrstuvwxyz");
         if (rc != EOK)
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 80,
+        rc = font_edit_paint_preview_str(fedit, 20, 80, color,
             "the quick brown fox jumps over the lazy dog");
         if (rc != EOK)
                 goto error;
 
-        rc = font_edit_paint_preview_str(fedit, 20, 100,
+        rc = font_edit_paint_preview_str(fedit, 20, 100, color,
             "0123456789,./<>?;'\\:\"|[]{}`~!@#$%^&*()-_=+");
         if (rc != EOK)