Changeset 06b8383 in mainline for uspace/app/fontedit

Timestamp:

2020-08-18T11:32:59Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

20d0098

Parents:

d2100e2

git-author:

Jiri Svoboda <jiri@…> (2020-08-17 18:32:40)

git-committer:

Jiri Svoboda <jiri@…> (2020-08-18 11:32:59)

Message:

Introduce typeface

In other words a font family.

Location:

uspace/app/fontedit

Files:

• fontedit.c (modified) (4 diffs)
• fontedit.h (modified) (2 diffs)

uspace/app/fontedit/fontedit.c

@@ -38 +38 @@
 #include <guigfx/canvas.h>
 #include <gfx/color.h>
+#include <gfx/font.h>
 #include <gfx/render.h>
+#include <gfx/typeface.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -117 +119 @@
         canvas_t *canvas = NULL;
         font_edit_t *fedit = NULL;
+        gfx_typeface_t *tface = NULL;
         gfx_font_t *font = NULL;
+        gfx_font_props_t props;
         gfx_font_metrics_t metrics;
         gfx_coord_t vw, vh;
@@ -178 +182 @@
 
         gc = canvas_gc_get_ctx(cgc);
+
+        rc = gfx_typeface_create(gc, &tface);
+        if (rc != EOK) {
+                printf("Error creating typeface.\n");
+                goto error;
+        }
+
+        gfx_font_props_init(&props);
         gfx_font_metrics_init(&metrics);
 
-        rc = gfx_font_create(gc, &metrics, &font);
+        rc = gfx_font_create(tface, &props, &metrics, &font);
         if (rc != EOK) {
                 printf("Error creating font.\n");
@@ -190 +202 @@
         fedit->width = vw;
         fedit->height = vh;
-        fedit->font = font;
+        fedit->typeface = tface;
 
         *rfedit = fedit;

uspace/app/fontedit/fontedit.h

@@ -37 +37 @@
 #define FONTEDIT_H
 
-#include <gfx/font.h>
+#include <gfx/typeface.h>
 #include <guigfx/canvas.h>
 
@@ -50 +50 @@
         /** Window height */
         int height;
-        /** Font */
-        gfx_font_t *font;
+        /** Typeface */
+        gfx_typeface_t *typeface;
 } font_edit_t;