From 1bf87556ef9953eeea5751714d87bdcc98b49702 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Wed, 25 May 2022 22:00:13 +0100
Subject: [PATCH] add textbbox and textlength to ImageDraw2 and update tests

---
 Tests/test_imagedraw.py  |  2 +-
 Tests/test_imagedraw2.py | 13 +++++++++----
 src/PIL/ImageDraw2.py    | 26 +++++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
index dca7bfe6a..23bc756bb 100644
--- a/Tests/test_imagedraw.py
+++ b/Tests/test_imagedraw.py
@@ -1239,7 +1239,7 @@ def test_textsize_empty_string():
 
 
 @skip_unless_feature("freetype2")
-def test_textsize_stroke():
+def test_textbbox_stroke():
     # Arrange
     im = Image.new("RGB", (W, H))
     draw = ImageDraw.Draw(im)
diff --git a/Tests/test_imagedraw2.py b/Tests/test_imagedraw2.py
index 3a70176ce..e4e8a38cb 100644
--- a/Tests/test_imagedraw2.py
+++ b/Tests/test_imagedraw2.py
@@ -1,5 +1,7 @@
 import os.path
 
+import pytest
+
 from PIL import Image, ImageDraw, ImageDraw2
 
 from .helper import (
@@ -205,7 +207,9 @@ def test_textsize():
     font = ImageDraw2.Font("white", FONT_PATH)
 
     # Act
-    size = draw.textsize("ImageDraw2", font)
+    with pytest.warns(DeprecationWarning) as log:
+        size = draw.textsize("ImageDraw2", font)
+    assert len(log) == 1
 
     # Assert
     assert size[1] == 12
@@ -221,9 +225,10 @@ def test_textsize_empty_string():
     # Act
     # Should not cause 'SystemError: <built-in method getsize of
     # ImagingFont object at 0x...> returned NULL without setting an error'
-    draw.textsize("", font)
-    draw.textsize("\n", font)
-    draw.textsize("test\n", font)
+    draw.textbbox((0, 0), "", font)
+    draw.textbbox((0, 0), "\n", font)
+    draw.textbbox((0, 0), "test\n", font)
+    draw.textlength("", font)
 
 
 @skip_unless_feature("freetype2")
diff --git a/src/PIL/ImageDraw2.py b/src/PIL/ImageDraw2.py
index 1f63110fd..6e6a307bd 100644
--- a/src/PIL/ImageDraw2.py
+++ b/src/PIL/ImageDraw2.py
@@ -25,6 +25,7 @@
 
 
 from . import Image, ImageColor, ImageDraw, ImageFont, ImagePath
+from ._deprecate import deprecate
 
 
 class Pen:
@@ -176,4 +177,27 @@ class Draw:
 
         .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textsize`
         """
-        return self.draw.textsize(text, font=font.font)
+        deprecate("textsize", 10, "textbbox or textlength")
+        return self.draw.textsize(text, font=font.font, __internal__=True)
+
+    def textbbox(self, xy, text, font):
+        """
+        Returns bounding box (in pixels) of given text.
+
+        :return: ``(left, top, right, bottom)`` bounding box
+
+        .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textbbox`
+        """
+        if self.transform:
+            xy = ImagePath.Path(xy)
+            xy.transform(self.transform)
+        return self.draw.textbbox(xy, text, font=font.font)
+
+    def textlength(self, text, font):
+        """
+        Returns length (in pixels) of given text.
+        This is the amount by which following text should be offset.
+
+        .. seealso:: :py:meth:`PIL.ImageDraw.ImageDraw.textlength`
+        """
+        return self.draw.textlength(text, font=font.font)