FIX: Make sure figure legends are properly transformed in tight_bbox

jklymak · jklymak · commit 1839d93fb3ec · 2020-05-25T21:24:47.000-07:00
diff --git a/lib/matplotlib/tight_bbox.py b/lib/matplotlib/tight_bbox.py
@@ -35,6 +35,11 @@ def _l(a, r, pos=pos):
         ax.set_axes_locator(_l)
         ax.set_aspect("auto")
 
+    legend_anchors = {}
+    for l in fig.legends:  # store legend anchors for the restore step.
+        anch = l.get_bbox_to_anchor()
+        legend_anchors[l] = anch.frozen()
+
     def restore_bbox():
         for ax, asp, loc in zip(fig.axes, asp_list, locator_list):
             ax.set_aspect(asp)
@@ -45,6 +50,9 @@ def restore_bbox():
         fig.set_tight_layout(orig_tight_layout)
         fig.transFigure._boxout = _boxout
         fig.transFigure.invalidate()
+        for l in fig.legends:  # re-set the anchor for legends...
+            anch = legend_anchors[l].transformed(fig.transFigure.inverted())
+            l.set_bbox_to_anchor(anch)
         fig.patch.set_bounds(0, 0, 1, 1)
 
     if fixed_dpi is not None:
@@ -59,6 +67,11 @@ def restore_bbox():
     fig.bbox_inches = Bbox.from_bounds(0, 0,
                                        bbox_inches.width, bbox_inches.height)
     x0, y0 = _bbox.x0, _bbox.y0
+
+    for l in fig.legends:  # offset the anchors...
+        anchor = legend_anchors[l].translated(-x0, -y0)  # in pixels
+        l.set_bbox_to_anchor(anchor.transformed(fig.transFigure.inverted()))
+
     w1, h1 = fig.bbox.width * dpi_scale, fig.bbox.height * dpi_scale
     fig.transFigure._boxout = Bbox.from_bounds(-x0, -y0, w1, h1)
     fig.transFigure.invalidate()
