Commit5a69602

committed

FIX

1 parent8aac613 commit5a69602Copy full SHA for 5a69602

File tree

+15

-14

lines changed

+15

-14

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+subplots_adjust no longer changes layout manager`
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`
	`3`	+Previously, if a user called `~matplotlib.Figure.subplots_adjust`, then
	`4`	+``constrained_layout`` was deactivated; this will no longer happen. If
	`5`	+the user wants `~matplotlib.Figure.subplots_adjust` to have an effect
	`6`	`+they need to use a compatible layout engine.`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1147,8 +1147,8 @@ def colorbar(self, mappable, cax=None, ax=None, use_gridspec=True, **kw):`
`1147`	`1147`	`"to colorbar().")`
`1148`	`1148`
`1149`	`1149`	`ifuse_gridspec:`
`1150`		`-if (self.layout_engineisnotNoneand`
`1151`		`-notself.layout_engine.colorbar_gridspec):`
	`1150`	`+if (self.get_layout_engine()isnotNoneand`
	`1151`	`+notself.get_layout_engine().colorbar_gridspec):`
`1152`	`1152`	`use_gridspec=False`
`1153`	`1153`	`# Store the value of gca so that we can set it back later on.`
`1154`	`1154`	`ifcaxisNone:`
`@@ -2064,6 +2064,9 @@ def get_constrained_layout_pads(self, relative=False):`
`2064`	`2064`	`"""`
`2065`	`2065`	`returnself._parent.get_constrained_layout_pads(relative=relative)`
`2066`	`2066`
	`2067`	`+defget_layout_engine(self):`
	`2068`	`+returnself._parent.get_layout_engine()`
	`2069`	`+`
`2067`	`2070`	`@property`
`2068`	`2071`	`defaxes(self):`
`2069`	`2072`	`"""`

Lines changed: 4 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -505,14 +505,6 @@ def test_figure_repr():`
`505`	`505`	`assertrepr(fig)=="<Figure size 100x200 with 0 Axes>"`
`506`	`506`
`507`	`507`
`508`		`-deftest_warn_cl_plus_tl():`
`509`		`-fig,ax=plt.subplots(constrained_layout=True)`
`510`		`-withpytest.warns(UserWarning):`
`511`		`-# this should warn,`
`512`		`-fig.subplots_adjust(top=0.8)`
`513`		`-assertnot(fig.get_constrained_layout())`
`514`		`-`
`515`		`-`
`516`	`508`	`@check_figures_equal(extensions=["png","pdf"])`
`517`	`509`	`deftest_add_artist(fig_test,fig_ref):`
`518`	`510`	`fig_test.set_dpi(100)`
`@@ -689,8 +681,8 @@ def test_all_nested(self, fig_test, fig_ref):`
`689`	`681`	`x= [["A","B"], ["C","D"]]`
`690`	`682`	`y= [["E","F"], ["G","H"]]`
`691`	`683`
`692`		`-fig_ref.set_constrained_layout(True)`
`693`		`-fig_test.set_constrained_layout(True)`
	`684`	`+fig_ref.set_layout_engine("constrained")`
	`685`	`+fig_test.set_layout_engine("constrained")`
`694`	`686`
`695`	`687`	`grid_axes=fig_test.subplot_mosaic([[x,y]])`
`696`	`688`	`foraxingrid_axes.values():`
`@@ -710,8 +702,8 @@ def test_all_nested(self, fig_test, fig_ref):`
`710`	`702`	`@check_figures_equal(extensions=["png"])`
`711`	`703`	`deftest_nested(self,fig_test,fig_ref):`
`712`	`704`
`713`		`-fig_ref.set_constrained_layout(True)`
`714`		`-fig_test.set_constrained_layout(True)`
	`705`	`+fig_ref.set_layout_engine("constrained")`
	`706`	`+fig_test.set_layout_engine("constrained")`
`715`	`707`
`716`	`708`	`x= [["A","B"], ["C","D"]]`
`717`	`709`

Comments

(0)