Merge pull request #25943 from meeseeksmachine/auto-backport-of-pr-25902-on-v3.7.x

timhoffm · web-flow · commit c20e16e52ad4 · 2023-05-22T08:52:25.000+02:00
Backport PR #25902 on branch v3.7.x (Fix TransformedBbox.{,full_}contains.)
diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
@@ -9,6 +9,7 @@
 import matplotlib.pyplot as plt
 import matplotlib.patches as mpatches
 import matplotlib.transforms as mtransforms
+from matplotlib.transforms import Affine2D, Bbox, TransformedBbox
 from matplotlib.path import Path
 from matplotlib.testing.decorators import image_comparison, check_figures_equal
 
@@ -755,3 +756,14 @@ def test_offset_copy_errors():
     with pytest.raises(ValueError,
                        match='For units of inches or points a fig kwarg is needed'):
         mtransforms.offset_copy(None, units='inches')
+
+
+def test_transformedbbox_contains():
+    bb = TransformedBbox(Bbox.unit(), Affine2D().rotate_deg(30))
+    assert bb.contains(.8, .5)
+    assert bb.contains(-.4, .85)
+    assert not bb.contains(.9, .5)
+    bb = TransformedBbox(Bbox.unit(), Affine2D().translate(.25, .5))
+    assert bb.contains(1.25, 1.5)
+    assert not bb.fully_contains(1.25, 1.5)
+    assert not bb.fully_contains(.1, .1)
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1144,6 +1144,14 @@ def get_points(self):
             self._check(points)
             return points
 
+    def contains(self, x, y):
+        # Docstring inherited.
+        return self._bbox.contains(*self._transform.inverted().transform((x, y)))
+
+    def fully_contains(self, x, y):
+        # Docstring inherited.
+        return self._bbox.fully_contains(*self._transform.inverted().transform((x, y)))
+
 
 class LockableBbox(BboxBase):
     """
