From f5d49f4f6166625fec381dc28886258a8be19f06 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 8 Mar 2021 19:53:59 +1100
Subject: [PATCH] Added rounded_rectangle method

---
 Tests/images/imagedraw_rounded_rectangle.png | Bin 0 -> 934 bytes
 Tests/test_imagedraw.py                      |  28 ++++++++++++
 docs/reference/ImageDraw.rst                 |  14 ++++++
 src/PIL/ImageDraw.py                         |  45 +++++++++++++++++++
 4 files changed, 87 insertions(+)
 create mode 100644 Tests/images/imagedraw_rounded_rectangle.png

diff --git a/Tests/images/imagedraw_rounded_rectangle.png b/Tests/images/imagedraw_rounded_rectangle.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e815f4ada247e8302c8cc5e053a162b4fe3ed01
GIT binary patch
literal 934
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k2}mkgS)OEIV9xb)aSW-L^Y+HYqE!YWZGkra
z`|j^~zUcByEkULy+m*8KcJ6r0b6;iKWfq_w7<m8k+peXrO1(EOiQDL5vF23Y^A%pa
zeXXG@5B7vVcJJd`&369r(ySXx>JO{=uCm%MWtMrNFZA{Hn$kOmx$mrcylh_ev~WwS
zgty)=UgoY9+4kq%s}Iie>-O!L=l3Kt@%*~)XYTyJsLt*EYRRoiQ~ffF50Ce5U9#%j
z>c4MhiCe$nUA=YQs&jb>(YyN&-SnFD%b+*8urBrDH`(lM4Xf<@AJ06uUgws?wVYk6
z?5-Z%*7onYY+VlLYB~KI>+Eh%^j&Se=B7(%?7?^2%H&#C?dq#Ne=A={>DQrEyTiAw
zUR_!9=<2SQ^JKd_`Zj3&Q?-~MRayVJ@2Sk5Woysh4fJT)&=JAC`dyqQ`}&;A_uI;J
zlv-SYVgh1<hm@QmTsXQp5(O1U1>pg*rZu#DecshQo!%8SzkmVTE(;2wjg~sgADZUY
zzLQPNopVC<%BkOdPLLSzJG}blm+ueEt;Gbb4{yqhJ-#pft}HMnx2;?7amw@XsBLc|
zHh13om9u;GtUt$;Qj#OSRvcXRb!A^p_~m)B*=DiP^PeY#UN*T~w(d^Uv+T#W_ALBn
zc5%;+jQ9C#u6b=+w^=&$YRQY^)!DYWbFUv*wd}9^!&`^?jtW=qlC{}=&$#%%`|oMt
zH*QB+#!b5)D_i&Ca`e8IL-$;+pPvdzun)FNS@!G?Og_f*_k4A)%rW^DiIdyjMeGmF
zGI)IT$Ha{r_Jx+&xQAvHSgg4Z&K>`Lal^6<kS_Vf|8#AFk@dm_5+G4eS3j3^P6<r_
D{5PKv

literal 0
HcmV?d00001

diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
index 7b1faadb795..0a2c7937da2 100644
--- a/Tests/test_imagedraw.py
+++ b/Tests/test_imagedraw.py
@@ -706,6 +706,34 @@ def test_rectangle_translucent_outline():
     )
 
 
+@pytest.mark.parametrize(
+    "xy",
+    [(10, 20, 190, 180), ([10, 20], [190, 180]), ((10, 20), (190, 180))],
+)
+def test_rounded_rectangle(xy):
+    # Arrange
+    im = Image.new("RGB", (200, 200))
+    draw = ImageDraw.Draw(im)
+
+    # Act
+    draw.rounded_rectangle(xy, 30, fill="red", outline="green", width=5)
+
+    # Assert
+    assert_image_equal_tofile(im, "Tests/images/imagedraw_rounded_rectangle.png")
+
+
+def test_rounded_rectangle_zero_radius():
+    # Arrange
+    im = Image.new("RGB", (W, H))
+    draw = ImageDraw.Draw(im)
+
+    # Act
+    draw.rounded_rectangle(BBOX1, 0, fill="blue", outline="green", width=5)
+
+    # Assert
+    assert_image_equal_tofile(im, "Tests/images/imagedraw_rectangle_width_fill.png")
+
+
 def test_floodfill():
     red = ImageColor.getrgb("red")
 
diff --git a/docs/reference/ImageDraw.rst b/docs/reference/ImageDraw.rst
index c780d714e8c..37fb5f72611 100644
--- a/docs/reference/ImageDraw.rst
+++ b/docs/reference/ImageDraw.rst
@@ -285,6 +285,20 @@ Methods
 
         .. versionadded:: 5.3.0
 
+.. py:method:: ImageDraw.rounded_rectangle(xy, radius=0, fill=None, outline=None, width=1)
+
+    Draws a rounded rectangle.
+
+    :param xy: Two points to define the bounding box. Sequence of either
+            ``[(x0, y0), (x1, y1)]`` or ``[x0, y0, x1, y1]``. The second point
+            is just outside the drawn rectangle.
+    :param radius: Radius of the corners.
+    :param outline: Color to use for the outline.
+    :param fill: Color to use for the fill.
+    :param width: The line width, in pixels.
+
+    .. versionadded:: 8.2.0
+
 .. py:method:: ImageDraw.shape(shape, fill=None, outline=None)
 
     .. warning:: This method is experimental.
diff --git a/src/PIL/ImageDraw.py b/src/PIL/ImageDraw.py
index b823be9a2aa..41ef1194e32 100644
--- a/src/PIL/ImageDraw.py
+++ b/src/PIL/ImageDraw.py
@@ -257,6 +257,51 @@ def rectangle(self, xy, fill=None, outline=None, width=1):
         if ink is not None and ink != fill and width != 0:
             self.draw.draw_rectangle(xy, ink, 0, width)
 
+    def rounded_rectangle(self, xy, radius=0, fill=None, outline=None, width=1):
+        """Draw a rounded rectangle."""
+        if isinstance(xy[0], (list, tuple)):
+            (x0, y0), (x1, y1) = xy
+        else:
+            x0, y0, x1, y1 = xy
+
+        # Do not allow the diameter to be greater than the width or height
+        d = min(radius * 2, x1 - x0, y1 - y0)
+        if d == 0:
+            return self.rectangle(xy, fill, outline, width)
+
+        ink, fill = self._getink(outline, fill)
+        if fill is not None:
+            self.draw.draw_pieslice((x1 - d, y0, x1, y0 + d), 270, 360, fill, 1)
+            self.draw.draw_pieslice((x1 - d, y1 - d, x1, y1), 0, 90, fill, 1)
+            self.draw.draw_pieslice((x0, y1 - d, x0 + d, y1), 90, 180, fill, 1)
+            self.draw.draw_pieslice((x0, y0, x0 + d, y0 + d), 180, 270, fill, 1)
+
+            self.draw.draw_rectangle((x0 + d / 2 + 1, y0, x1 - d / 2 - 1, y1), fill, 1)
+            self.draw.draw_rectangle(
+                (x0, y0 + d / 2 + 1, x0 + d / 2, y1 - d / 2 - 1), fill, 1
+            )
+            self.draw.draw_rectangle(
+                (x1 - d / 2, y0 + d / 2 + 1, x1, y1 - d / 2 - 1), fill, 1
+            )
+        if ink is not None and ink != fill and width != 0:
+            self.draw.draw_arc((x1 - d, y0, x1, y0 + d), 270, 360, ink, width)
+            self.draw.draw_arc((x1 - d, y1 - d, x1, y1), 0, 90, ink, width)
+            self.draw.draw_arc((x0, y1 - d, x0 + d, y1), 90, 180, ink, width)
+            self.draw.draw_arc((x0, y0, x0 + d, y0 + d), 180, 270, ink, width)
+
+            self.draw.draw_rectangle(
+                (x1 - width + 1, y0 + d / 2 + 1, x1, y1 - d / 2 - 1), ink, 1
+            )
+            self.draw.draw_rectangle(
+                (x0 + d / 2 + 1, y1 - width + 1, x1 - d / 2 - 1, y1), ink, 1
+            )
+            self.draw.draw_rectangle(
+                (x0, y0 + d / 2 + 1, x0 + width - 1, y1 - d / 2 - 1), ink, 1
+            )
+            self.draw.draw_rectangle(
+                (x0 + d / 2 + 1, y0, x1 - d / 2 - 1, y0 + width - 1), ink, 1
+            )
+
     def _multiline_check(self, text):
         """Draw text."""
         split_character = "\n" if isinstance(text, str) else b"\n"