update fix based on anntzer's suggestion

zhoubecky · zhoubecky · commit 66403eb7819b · 2018-03-26T13:50:54.000-04:00
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -137,23 +137,17 @@ def contains(self, mouseevent, radius=None):
         """
         if callable(self._contains):
             return self._contains(self, mouseevent)
-        inside = False
-        start = 0
         radius = self._process_radius(radius)
         codes = self.get_path().codes
         vertices = self.get_path().vertices
-        for i in range(1, len(codes)+1):
-            # fix bug (#8384)
-            # if current path is concatenated by multiple pathes
-            # check if any subpath contains the point.
-            if (i == len(codes)) or (codes[i] == 1):
-                path = Path(np.concatenate([vertices[start: i]]),
-                            np.concatenate([codes[start: i]]))
-                inside = inside or path.contains_point(
-                    (mouseevent.x, mouseevent.y), self.get_transform(), radius
-                )
-                start = i
-        return inside, {}
+        idxs, = np.nonzero(codes == 1)
+        # Don't split before the first MOVETO.
+        idxs = idxs[1:]
+        return any(
+            subpath.contains_point(
+                (mouseevent.x, mouseevent.y), self.get_transform(), radius)
+            for subpath in map(
+                Path, np.split(vertices, idxs), np.split(codes, idxs))), {}
 
     def contains_point(self, point, radius=None):
         """
