Annotate: draw text before arrow; closes #4140

efiring · efiring · commit 78292626b636 · 2015-07-19T09:31:50.000-10:00
Some comment and docstring typos are also fixed.
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -2658,14 +2658,14 @@ class ConnectionStyle(_Style):
 
     class _Base(object):
         """
-        A base class for connectionstyle classes. The dervided needs
-        to implement a *connect* methods whose call signature is::
+        A base class for connectionstyle classes. The subclass needs
+        to implement a *connect* method whose call signature is::
 
           connect(posA, posB)
 
         where posA and posB are tuples of x, y coordinates to be
-        connected.  The methods needs to return a path connecting two
-        points. This base class defines a __call__ method, and few
+        connected.  The method needs to return a path connecting two
+        points. This base class defines a __call__ method, and a few
         helper methods.
         """
 
@@ -2749,7 +2749,7 @@ def __call__(self, posA, posB,
             return shrinked_path
 
         def __reduce__(self):
-            # because we have decided to nest thes classes, we need to
+            # because we have decided to nest these classes, we need to
             # add some more information to allow instance pickling.
             import matplotlib.cbook as cbook
             return (cbook._NestedClassGetter(),
@@ -2994,7 +2994,7 @@ def connect(self, posA, posB):
     class Bar(_Base):
         """
         A line with *angle* between A and B with *armA* and
-        *armB*. One of the arm is extend so that they are connected in
+        *armB*. One of the arms is extended so that they are connected in
         a right angle. The length of armA is determined by (*armA*
         + *fraction* x AB distance). Same for armB.
         """
@@ -3968,7 +3968,7 @@ def __init__(self, posA=None, posB=None,
         """
         If *posA* and *posB* is given, a path connecting two point are
         created according to the connectionstyle. The path will be
-        clipped with *patchA* and *patchB* and further shirnked by
+        clipped with *patchA* and *patchB* and further shrinked by
         *shrinkA* and *shrinkB*. An arrow is drawn along this
         resulting path using the *arrowstyle* parameter. If *path*
         provided, an arrow is drawn along this path and *patchA*,
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -319,7 +319,7 @@ def update_from(self, other):
     def _get_layout(self, renderer):
         """
         return the extent (bbox) of the text together with
-        multile-alignment information. Note that it returns a extent
+        multiple-alignment information. Note that it returns an extent
         of a rotated text when necessary.
         """
         key = self.get_prop_tup()
@@ -481,6 +481,9 @@ def set_bbox(self, rectprops):
 
         if rectprops is not None:
             props = rectprops.copy()
+            # Dump the pad kwarg; we still need to figure out how to
+            # use it to expand the box, for backwards compatibility.
+            pad = props.pop('pad', 4)  # noqa
             boxstyle = props.pop("boxstyle", "square")
             bbox_transmuter = props.pop("bbox_transmuter", None)
 
@@ -948,7 +951,7 @@ def set_backgroundcolor(self, color):
         ACCEPTS: any matplotlib color
         """
         if self._bbox_patch is None:
-            self.set_bbox = dict(facecolor=color, edgecolor=color)
+            self.set_bbox(dict(facecolor=color, edgecolor=color))
         else:
             self._bbox_patch.update(dict(facecolor=color))
 
@@ -2227,6 +2230,10 @@ def draw(self, renderer):
         self._update_position_xytext(renderer, xy_pixel)
         self.update_bbox_position_size(renderer)
 
+        # Draw text, including FancyBboxPatch, before FancyArrowPatch.
+        # Otherwise, the transform of the former Patch will be incomplete.
+        Text.draw(self, renderer)
+
         if self.arrow is not None:
             if self.arrow.figure is None and self.figure is not None:
                 self.arrow.figure = self.figure
@@ -2237,8 +2244,6 @@ def draw(self, renderer):
                 self.arrow_patch.figure = self.figure
             self.arrow_patch.draw(renderer)
 
-        Text.draw(self, renderer)
-
     def get_window_extent(self, renderer=None):
         '''
         Return a :class:`~matplotlib.transforms.Bbox` object bounding
