Changeset 8bf9058 in mainline

Timestamp:

2020-10-06T18:57:04Z (4 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

Files:

• app/gfxdemo/gfxdemo.c (modified) (9 diffs)
• lib/gfxfont/include/types/gfx/text.h (modified) (1 diff)
• lib/gfxfont/src/text.c (modified) (2 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -502 +502 @@
 
         rect.p0.x = w / 20;
-        rect.p0.y = 3 * h / 15;
+        rect.p0.y = 2 * h / 15;
         rect.p1.x = w - w / 20;
         rect.p1.y = 5 * h / 15;
@@ -530 +530 @@
         }
 
-        pos.x = (rect.p0.x + rect.p1.x) / 2;
+        pos.x = (rect.p0.x + rect.p1.x - 1) / 2;
         pos.y = rect.p0.y;
         fmt.halign = gfx_halign_center;
@@ -537 +537 @@
                 goto error;
 
-        pos.x = rect.p1.x;
+        pos.x = rect.p1.x - 1;
         pos.y = rect.p0.y;
         fmt.halign = gfx_halign_right;
@@ -547 +547 @@
 
         pos.x = rect.p0.x;
-        pos.y = (rect.p0.y + rect.p1.y) / 2;
+        pos.y = (rect.p0.y + rect.p1.y - 1) / 2;
         fmt.halign = gfx_halign_left;
         rc = gfx_puttext(font, &pos, &fmt, "Center left");
@@ -553 +553 @@
                 goto error;
 
-        pos.x = (rect.p0.x + rect.p1.x) / 2;
-        pos.y = (rect.p0.y + rect.p1.y) / 2;
+        pos.x = (rect.p0.x + rect.p1.x - 1) / 2;
+        pos.y = (rect.p0.y + rect.p1.y - 1) / 2;
         fmt.halign = gfx_halign_center;
         rc = gfx_puttext(font, &pos, &fmt, "Center");
@@ -560 +560 @@
                 goto error;
 
-        pos.x = rect.p1.x;
-        pos.y = (rect.p0.y + rect.p1.y) / 2;
+        pos.x = rect.p1.x - 1;
+        pos.y = (rect.p0.y + rect.p1.y - 1) / 2;
         fmt.halign = gfx_halign_right;
         rc = gfx_puttext(font, &pos, &fmt, "Center right");
@@ -570 +570 @@
 
         pos.x = rect.p0.x;
-        pos.y = rect.p1.y;
+        pos.y = rect.p1.y - 1;
         fmt.halign = gfx_halign_left;
         rc = gfx_puttext(font, &pos, &fmt, "Bottom left");
@@ -576 +576 @@
                 goto error;
 
-        pos.x = (rect.p0.x + rect.p1.x) / 2;
-        pos.y = rect.p1.y;
+        pos.x = (rect.p0.x + rect.p1.x - 1) / 2;
+        pos.y = rect.p1.y - 1;
         fmt.halign = gfx_halign_center;
         rc = gfx_puttext(font, &pos, &fmt, "Bottom center");
@@ -583 +583 @@
                 goto error;
 
-        pos.x = rect.p1.x;
-        pos.y = rect.p1.y;
+        pos.x = rect.p1.x - 1;
+        pos.y = rect.p1.y - 1;
         fmt.halign = gfx_halign_right;
         rc = gfx_puttext(font, &pos, &fmt, "Bottom right");

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;