matplotlib
diff --git a/‎lib/matplotlib/legend.py
Copy file name to clipboardExpand all lines: lib/matplotlib/legend.py
+11-5Lines changed: 11 additions & 5 deletions b/‎lib/matplotlib/legend.py
Copy file name to clipboardExpand all lines: lib/matplotlib/legend.py
+11-5Lines changed: 11 additions & 5 deletions
@@ -39,7 +39,8 @@
 import matplotlib.colors as colors
 from matplotlib.font_manager import FontProperties
 from matplotlib.lines import Line2D
-from matplotlib.patches import Patch, Rectangle, Shadow, FancyBboxPatch
+from matplotlib.patches import (Patch, Rectangle, Shadow, FancyBboxPatch,
+                                    FancyArrowPatch)
 from matplotlib.collections import (LineCollection, RegularPolyCollection,
                                     CircleCollection, PathCollection,
                                     PolyCollection)
@@ -50,6 +51,7 @@
 from matplotlib.offsetbox import DraggableOffsetBox
 
 from matplotlib.container import ErrorbarContainer, BarContainer, StemContainer
+from matplotlib.text import Annotation, Text
 from . import legend_handler
 
 
@@ -565,7 +567,6 @@ def _set_loc(self, loc):
         # value of the find_offset.
         self._loc_real = loc
         self.stale = True
-        self._legend_box.set_offset(self._findoffset)
 
     def _get_loc(self):
         return self._loc_real
@@ -649,7 +650,10 @@ def _approx_text_height(self, renderer=None):
             update_func=legend_handler.update_from_first_child),
         tuple: legend_handler.HandlerTuple(),
         PathCollection: legend_handler.HandlerPathCollection(),
-        PolyCollection: legend_handler.HandlerPolyCollection()
+        PolyCollection: legend_handler.HandlerPolyCollection(),
+        FancyArrowPatch: legend_handler.HandlerFancyArrowPatch(),
+        Text: legend_handler.HandlerText(),
+        Annotation: legend_handler.HandlerAnnotation()
         }
 
     # (get|set|update)_default_handler_maps are public interfaces to
@@ -837,6 +841,7 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
                                    children=[self._legend_title_box,
                                              self._legend_handle_box])
         self._legend_box.set_figure(self.figure)
+        self._legend_box.set_offset(self._findoffset)
         self.texts = text_list
         self.legendHandles = handle_list
 
@@ -1142,12 +1147,13 @@ def _get_legend_handles(axs, legend_handler_map=None):
     handles_original = []
     for ax in axs:
         handles_original += (ax.lines + ax.patches +
-                             ax.collections + ax.containers)
+                             ax.collections + ax.containers + ax.texts)
         # support parasite axes:
         if hasattr(ax, 'parasites'):
             for axx in ax.parasites:
                 handles_original += (axx.lines + axx.patches +
-                                     axx.collections + axx.containers)
+                                     axx.collections + axx.containers +
+                                     axx.texts)
 
     handler_map = Legend.get_default_handler_map()