A slightly different approach is beeded to deal with angled text.

tcltk · Sep 23, 2024 · 06b2132 · 06b2132
1 parent 6e51918
commit 06b2132
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c
@@ -737,6 +737,12 @@ ComputeTextBbox(
 	width = height = 0;
     }
 
+    /* Extend the width to account for characters that overhang.
+     * See [7ea3245acd]
+     */
+
+    width += overhang;
+
     /*
      * Use overall geometry information to compute the top-left corner of the
      * bounding box for the text item.
@@ -841,12 +847,7 @@ ComputeTextBbox(
 	    tmp = x[i];
 	}
     }
-
-    /* Extend the bounding box to account for characters that overhang.
-     * See [7ea3245acd]
-     */
-
-    textPtr->header.x2 = ROUND(tmp) + overhang;
+    textPtr->header.x2 = ROUND(tmp);
     for (i=1,tmp=y[0] ; i<4 ; i++) {
 	if (y[i] > tmp) {
 	    tmp = y[i];

diff --git a/tests/canvText.test b/tests/canvText.test
@@ -967,7 +967,7 @@ test canvText-20.1 {angled text bounding box} -setup {
     # bboxes should be the same, possibly with a small (platform-specific) rounding difference
     list [expr {[almosteq $bb0 $bb2] ? "ok" : "$bb0,$bb2"}] \
 	[expr {[almosteq $bb1 $bb3] ? "ok" : "$bb1,$bb3"}] \
-	[expr {[almosteq $bb0 [transpose $bb1]] ? "ok" : "$bb0,$bb1"}]
+	[expr {[almosteq $bb0 [transpose $bb1]] ? "ok" : "$bb0,[transpose $bb1]"}]
 } -cleanup {
     destroy .c
     rename transpose {}