Changeset 400a16d in mainline for uspace/app/gfxdemo/gfxdemo.c

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

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (4 diffs)

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");