Changeset 06b8383 in mainline for uspace/lib/gfxfont/include/types/gfx/font.h

Timestamp:

2020-08-18T11:32:59Z (4 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.

File:

• uspace/lib/gfxfont/include/types/gfx/font.h (modified) (1 diff)

uspace/lib/gfxfont/include/types/gfx/font.h

@@ -42 +42 @@
 typedef struct gfx_font gfx_font_t;
 
-/** Font metrics */
+struct gfx_font_info;
+typedef struct gfx_font_info gfx_font_info_t;
+
+/** Font flags */
+typedef enum {
+        /** Bold */
+        gff_bold = 0x1,
+        /** Italic */
+        gff_italic = 0x2,
+        /** Bold, italic */
+        gff_bold_italic = gff_bold | gff_italic
+} gfx_font_flags_t;
+
+/** Font properties */
 typedef struct {
-        /** Ascent */
-        gfx_coord_t ascent;
-        /** Descent */
-        gfx_coord_t descent;
-        /** Leading */
-        gfx_coord_t leading;
-} gfx_font_metrics_t;
-
-/** Text metrics */
-typedef struct {
-        /** Bounding rectangle (not including oversize elements) */
-        gfx_rect_t bounds;
-} gfx_text_metrics_t;
+        /** Size */
+        gfx_coord_t size;
+        /** Flags */
+        gfx_font_flags_t flags;
+} gfx_font_props_t;
 
 #endif