Changeset 400a16d in mainline

Timestamp:

2021-09-03T09:27:57Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

81d3612

Parents:

f7c12b3

git-author:

Jiri Svoboda <jiri@…> (2021-09-02 17:26:05)

git-committer:

Jiri Svoboda <jiri@…> (2021-09-03 09:27:57)

Message:

Clarify right/bottom-aligned text position and fix off-by-ones

Location:

uspace

Files:

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

uspace/app/gfxdemo/gfxdemo.c

@@ -706 +706 @@
                 goto error;
 
-        pos.x = rect.p1.x - 1;
+        pos.x = rect.p1.x;
         pos.y = rect.p0.y;
         fmt.halign = gfx_halign_right;
@@ -729 +729 @@
                 goto error;
 
-        pos.x = rect.p1.x - 1;
+        pos.x = rect.p1.x;
         pos.y = (rect.p0.y + rect.p1.y - 1) / 2;
         fmt.halign = gfx_halign_right;
@@ -746 +746 @@
 
         pos.x = (rect.p0.x + rect.p1.x - 1) / 2;
-        pos.y = rect.p1.y - 1;
+        pos.y = rect.p1.y;
         fmt.halign = gfx_halign_center;
         rc = gfx_puttext(font, &pos, &fmt, "Bottom center");
@@ -752 +752 @@
                 goto error;
 
-        pos.x = rect.p1.x - 1;
-        pos.y = rect.p1.y - 1;
+        pos.x = rect.p1.x;
+        pos.y = rect.p1.y;
         fmt.halign = gfx_halign_right;
         rc = gfx_puttext(font, &pos, &fmt, "Bottom right");

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

@@ -42 +42 @@
 /** Text horizontal alignment */
 typedef enum {
-        /** Align text left */
+        /** Align text left (start at anchor point) */
         gfx_halign_left,
-        /** Align text on the center */
+        /** Align text on the center (center around anchor point) */
         gfx_halign_center,
-        /** Align text right */
+        /** Align text right (end just before anchor point) */
         gfx_halign_right,
         /** Justify text on both left and right edge */
@@ -54 +54 @@
 /** Text vertical alignment */
 typedef enum {
-        /** Align top */
+        /** Align top (starts at anchor point) */
         gfx_valign_top,
-        /** Align center */
+        /** Align center (centered around anchor point) */
         gfx_valign_center,
-        /** Align bottom */
+        /** Align bottom (end just before anchor point) */
         gfx_valign_bottom,
         /** Align to baseline */

uspace/lib/gfxfont/src/text.c

@@ -191 +191 @@
                         break;
                 case gfx_halign_right:
-                        spos->x -= width - 1;
+                        spos->x -= width;
                         break;
                 default:
@@ -210 +210 @@
                         break;
                 case gfx_valign_bottom:
-                        cpos.y -= fmetrics.descent;
+                        cpos.y -= fmetrics.descent + 1;
                         break;
                 default:

uspace/lib/ui/src/wdecor.c

@@ -345 +345 @@
                         geom->title_bar_rect.p0 = geom->interior_rect.p0;
                         geom->title_bar_rect.p1.x = geom->interior_rect.p1.x;
-                        geom->title_bar_rect.p1.y = geom->interior_rect.p0.y
-                            + wdecor_tbar_h;
+                        geom->title_bar_rect.p1.y = geom->interior_rect.p0.y +
+                            wdecor_tbar_h;
                 }