Restore fast(er) impl. of overlaps.

anntzer · anntzer · commit aa406bf4b015 · 2017-02-20T17:36:43.000-08:00
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -466,8 +466,17 @@ def overlaps(self, other):
         """
         Returns whether this bounding box overlaps with the other bounding box.
         """
-        return (self.xmin <= other.xmax and other.xmin <= self.xmax
-                and self.ymin <= other.ymax and other.ymin <= self.ymax)
+        ax1, ay1, ax2, ay2 = self.extents
+        bx1, by1, bx2, by2 = other.extents
+        if ax2 < ax1:
+            ax2, ax1 = ax1, ax2
+        if ay2 < ay1:
+            ay2, ay1 = ay1, ay2
+        if bx2 < bx1:
+            bx2, bx1 = bx1, bx2
+        if by2 < by1:
+            by2, by1 = by1, by2
+        return ax1 <= bx2 and bx1 <= ax2 and ay1 <= by2 and by1 <= ay2
 
     def fully_containsx(self, x):
         """
@@ -494,8 +503,17 @@ def fully_overlaps(self, other):
         Returns whether this bounding box overlaps with the other bounding box,
         not including the edges.
         """
-        return (self.xmin < other.xmax and other.xmin < self.xmax
-                and self.ymin < other.ymax and other.ymin < self.ymax)
+        ax1, ay1, ax2, ay2 = self.extents
+        bx1, by1, bx2, by2 = other.extents
+        if ax2 < ax1:
+            ax2, ax1 = ax1, ax2
+        if ay2 < ay1:
+            ay2, ay1 = ay1, ay2
+        if bx2 < bx1:
+            bx2, bx1 = bx1, bx2
+        if by2 < by1:
+            by2, by1 = by1, by2
+        return ax1 < bx2 and bx1 < ax2 and ay1 < by2 and by1 < ay2
 
     def transformed(self, transform):
         """
