Merge pull request #19965 from meeseeksmachine/auto-backport-of-pr-19961-on-v3.4.x

QuLogic · web-flow · commit 3767fd0c89a8 · 2021-04-15T03:02:49.000-04:00
Backport PR #19961 on branch v3.4.x (FIX: subfigure tightbbox)
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1652,7 +1652,11 @@ def get_tightbbox(self, renderer, bbox_extra_artists=None):
                   and (b.width != 0 or b.height != 0))]
 
         if len(bb) == 0:
-            return self.bbox_inches
+            if hasattr(self, 'bbox_inches'):
+                return self.bbox_inches
+            else:
+                # subfigures do not have bbox_inches, but do have a bbox
+                bb = [self.bbox]
 
         _bbox = Bbox.union(bb)
 
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -900,6 +900,15 @@ def test_subfigure():
     fig.suptitle('Figure suptitle', fontsize='xx-large')
 
 
+def test_subfigure_tightbbox():
+    # test that we can get the tightbbox with a subfigure...
+    fig = plt.figure(constrained_layout=True)
+    sub = fig.subfigures(1, 2)
+
+    np.testing.assert_allclose(
+            fig.get_tightbbox(fig.canvas.get_renderer()).width, 0.1)
+
+
 @image_comparison(['test_subfigure_ss.png'], style='mpl20',
                   savefig_kwarg={'facecolor': 'teal'},
                   remove_text=False)
