Fix the right bound filling incorrectly

Because the right side of graph is cutoff, we add 1 to the width computation (via left and right index) to ensure proper bound of the graph. Close #78
sysprog21 · Dec 8, 2024 · 91bbeff · 91bbeff
1 parent a90b142
commit 91bbeff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/apps/multi.c b/apps/multi.c
@@ -39,7 +39,7 @@ static void apps_circletext_start(twin_screen_t *screen,
 {
     twin_window_t *window = twin_window_create(
         screen, TWIN_ARGB32, TwinWindowApplication, x, y, w, h);
-    int wid = window->client.right - window->client.left;
+    int wid = window->client.right - window->client.left + 1;
     int hei = window->client.bottom - window->client.top;
     twin_pixmap_t *pixmap = window->pixmap;
     twin_path_t *path = twin_path_create();
@@ -84,7 +84,7 @@ static void apps_quickbrown_start(twin_screen_t *screen,
 {
     twin_window_t *window = twin_window_create(
         screen, TWIN_ARGB32, TwinWindowApplication, x, y, w, h);
-    int wid = window->client.right - window->client.left;
+    int wid = window->client.right - window->client.left + 1;
     int hei = window->client.bottom - window->client.top;
     twin_pixmap_t *pixmap = window->pixmap;
     twin_path_t *path = twin_path_create();
@@ -127,7 +127,7 @@ static void apps_ascii_start(twin_screen_t *screen, int x, int y, int w, int h)
 {
     twin_window_t *window = twin_window_create(
         screen, TWIN_ARGB32, TwinWindowApplication, x, y, w, h);
-    int wid = window->client.right - window->client.left;
+    int wid = window->client.right - window->client.left + 1;
     int hei = window->client.bottom - window->client.top;
     twin_pixmap_t *pixmap = window->pixmap;
     twin_path_t *path = twin_path_create();

diff --git a/src/path.c b/src/path.c
@@ -612,7 +612,7 @@ void twin_composite_path(twin_pixmap_t *dst,
     if (bounds.left >= bounds.right || bounds.top >= bounds.bottom)
         return;
 
-    twin_coord_t width = bounds.right - bounds.left;
+    twin_coord_t width = bounds.right - bounds.left + 1;
     twin_coord_t height = bounds.bottom - bounds.top;
     twin_pixmap_t *mask = twin_pixmap_create(TWIN_A8, width, height);
     if (!mask)