Changeset 38a4b6d in mainline

Timestamp:

2020-09-30T19:46:07Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d884672

Parents:

7358f5b

Message:

Preview more characters

File:

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

uspace/app/fontedit/fontedit.c

@@ -53 +53 @@
         glyph_scale = 8,
         glyph_orig_x = 100,
-        glyph_orig_y = 100
+        glyph_orig_y = 200
 };
 
@@ -346 +346 @@
 }
 
-/** Paint font preview.
+/** Paint font preview string.
  *
  * @param fedit Font editor
- */
-static errno_t font_edit_paint_preview(font_edit_t *fedit)
+ * @param x Starting X coordinate
+ * @Param y Starting Y coordinate
+ * @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_glyph_metrics_t gmetrics;
         size_t stradv;
         const char *cp;
+        gfx_coord2_t pos;
         gfx_glyph_t *glyph;
-        gfx_coord2_t pos;
-        errno_t rc;
-
-        cp = "ABCD";
-        pos.x = 20;
-        pos.y = 20;
+        errno_t rc;
+
+        pos.x = x;
+        pos.y = y;
+        cp = str;
 
         while (*cp != '\0') {
@@ -379 +383 @@
                 pos.x += gmetrics.advance;
         }
+
+        return EOK;
+}
+
+/** Paint font preview.
+ *
+ * @param fedit Font editor
+ */
+static errno_t font_edit_paint_preview(font_edit_t *fedit)
+{
+        errno_t rc;
+
+        rc = font_edit_paint_preview_str(fedit, 20, 20,
+            "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+        if (rc != EOK)
+                return rc;
+
+        rc = font_edit_paint_preview_str(fedit, 20, 40,
+            "THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG");
+        if (rc != EOK)
+                return rc;
+
+        rc = font_edit_paint_preview_str(fedit, 20, 60,
+            "abcdefghijklmnopqrstuvwxyz");
+        if (rc != EOK)
+                return rc;
+
+        rc = font_edit_paint_preview_str(fedit, 20, 80,
+            "the quick brown fox jumps over the lazy dog");
+        if (rc != EOK)
+                return rc;
 
         return EOK;