Aug 12, 2019 · Jul 30, 2019 · Aug 6, 2019 · Aug 5, 2019 · Aug 6, 2019 · Aug 9, 2019
diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py
    invTransFig = fig.transFigure.inverted().transform_bbox
    pos = ax.get_position(original=True)
    tightbbox = ax.get_tightbbox(renderer=renderer)
    bbox = invTransFig(tightbbox)
    if tightbbox is None:
        bbox = pos
    else:
        bbox = invTransFig(tightbbox)

    # this can go wrong:
    if not (np.isfinite(bbox.width) and np.isfinite(bbox.height)):
        # just abort, this is likely a bad set of co-ordinates that
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
    fig.colorbar(pcm, ax=axs[-2, 3:], shrink=0.5, location='top')
    fig.colorbar(pcm, ax=axs[0, 0], shrink=0.5, location='left')
    fig.colorbar(pcm, ax=axs[1:3, 2], shrink=0.5, location='right')


 def test_hidden_axes():
    # test that if we make an axes not visible that constrained_layout
    # still works.  Note the axes still takes space in the layout
    # (as does a gridspec slot that is empty)
    fig, axs = plt.subplots(2, 2, constrained_layout=True)
    axs[0, 1].set_visible(False)
    fig.canvas.draw()
    extents1 = np.copy(axs[0, 0].get_position().extents)

    np.testing.assert_allclose(extents1,
        [0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-5)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -272,7 +272,11 @@ def _make_layout_margins(ax, renderer, h_pad, w_pad):
		invTransFig = fig.transFigure.inverted().transform_bbox
		pos = ax.get_position(original=True)
		tightbbox = ax.get_tightbbox(renderer=renderer)
		bbox = invTransFig(tightbbox)
		if tightbbox is None:
Copy link Member timhoffmAug 5, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Just: `bbox = pos if tightbbox is None else invTransFig(tightbbox)` Copy link MemberAuthor jklymakAug 6, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I find those really hard to read a lot of the time. Copy link Member timhoffmAug 9, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Actually, when reading a function for a basic understanding what it does I find this more easy. It's just one line saying: "Sets`bbox` depending on some condition". The if/else is already more low level. But not fighting over this.
		bbox = pos
		else:
		bbox = invTransFig(tightbbox)

		# this can go wrong:
		if not (np.isfinite(bbox.width) and np.isfinite(bbox.height)):
		# just abort, this is likely a bad set of co-ordinates that
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -387,3 +387,16 @@ def test_colorbar_location():
		fig.colorbar(pcm, ax=axs[-2, 3:], shrink=0.5, location='top')
		fig.colorbar(pcm, ax=axs[0, 0], shrink=0.5, location='left')
		fig.colorbar(pcm, ax=axs[1:3, 2], shrink=0.5, location='right')


		def test_hidden_axes():
dstansby marked this conversation as resolved. Show resolvedHide resolved
		# test that if we make an axes not visible that constrained_layout
		# still works. Note the axes still takes space in the layout
		# (as does a gridspec slot that is empty)
		fig, axs = plt.subplots(2, 2, constrained_layout=True)
		axs[0, 1].set_visible(False)
		fig.canvas.draw()
		extents1 = np.copy(axs[0, 0].get_position().extents)

		np.testing.assert_allclose(extents1,
		[0.045552, 0.548288, 0.47319, 0.982638], rtol=1e-5)