FIX: fix bbox_inches=tight and constrained layout bad interaction

jklymak · jklymak · commit 1f60cfb4cff8 · 2021-01-22T14:08:22.000-08:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2196,6 +2196,8 @@ def print_figure(
             self.figure.set_facecolor(facecolor)
             self.figure.set_edgecolor(edgecolor)
 
+            cl_state = self.figure.get_constrained_layout()
+
             if bbox_inches is None:
                 bbox_inches = rcParams['savefig.bbox']
             if bbox_inches:
@@ -2210,6 +2212,7 @@ def print_figure(
                            else suppress())
                     with ctx:
                         self.figure.draw(renderer)
+                        self.figure.set_constrained_layout(False)
 
                     bbox_inches = self.figure.get_tightbbox(
                         renderer, bbox_extra_artists=bbox_extra_artists)
@@ -2241,6 +2244,7 @@ def print_figure(
                 self.figure.set_facecolor(origfacecolor)
                 self.figure.set_edgecolor(origedgecolor)
                 self.figure.set_canvas(self)
+            self.figure.set_constrained_layout(cl_state)
             return result
 
     @classmethod
diff --git a/lib/matplotlib/tests/baseline_images/test_constrainedlayout/test_bboxtight.png b/lib/matplotlib/tests/baseline_images/test_constrainedlayout/test_bboxtight.png
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -503,3 +503,11 @@ def test_manually_set_position():
     fig.canvas.draw()
     pp = axs[0].get_position()
     np.testing.assert_allclose(pp, [[0.2, 0.2], [0.44, 0.5]])
+
+
+@image_comparison(['test_bboxtight.png'],
+                  remove_text=True, style='mpl20',
+                  savefig_kwarg={'bbox_inches': 'tight'})
+def test_bboxtight():
+    fig, ax = plt.subplots(constrained_layout=True)
+    ax.set_aspect(1.)
