Changeset 8bf9058 in mainline for uspace/lib/gfxfont

Timestamp:

2020-10-06T18:57:04Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0d62c10

Parents:

74f59b7

Message:

Bottom text should be aligned on the descender line

However, we'll leave baseline alignment as an explicit option.

Location:

uspace/lib/gfxfont

Files:

• include/types/gfx/text.h (modified) (1 diff)
• src/text.c (modified) (2 diffs)

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

@@ -58 +58 @@
         gfx_valign_center,
         /** Align bottom */
-        gfx_valign_bottom
+        gfx_valign_bottom,
+        /** Align to baseline */
+        gfx_valign_baseline
 } gfx_valign_t;
 

uspace/lib/gfxfont/src/text.c

@@ -123 +123 @@
 
         /* Adjust position for vertical alignment */
-        if (fmt->valign != gfx_valign_bottom) {
-                gfx_font_get_metrics(font, &fmetrics);
+        gfx_font_get_metrics(font, &fmetrics);
 
+        if (fmt->valign != gfx_valign_baseline) {
                 switch (fmt->valign) {
                 case gfx_valign_top:
@@ -133 +133 @@
                         cpos.y += fmetrics.ascent / 2;
                         break;
+                case gfx_valign_bottom:
+                        cpos.y -= fmetrics.descent;
+                        break;
                 default:
                         break;