Commit70e7d18

committed

FIX: Stop tight layout collapsing under zoom

1 parent4bc1ca9 commit70e7d18Copy full SHA for 70e7d18

File tree

+17

-2

lines changed

+17

-2

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2347,6 +2347,13 @@ def tight_layout(self, renderer=None, pad=1.08, h_pad=None, w_pad=None,`
`2347`	`2347`	`from .tight_layoutimport (`
`2348`	`2348`	`get_renderer,get_subplotspec_list,get_tight_layout_figure)`
`2349`	`2349`
	`2350`	`+try:`
	`2351`	`+ifself.canvas.toolbar._activein ('PAN','ZOOM'):`
	`2352`	`+# don't do tight layout during zoom and pan.`
	`2353`	`+return`
	`2354`	`+exceptAttributeError:`
	`2355`	`+# not toolbar, or no _active attribute..`
	`2356`	`+pass`
`2350`	`2357`	`subplotspec_list=get_subplotspec_list(self.axes)`
`2351`	`2358`	`ifNoneinsubplotspec_list:`
`2352`	`2359`	`warnings.warn("This figure includes Axes that are not compatible "`
`@@ -2358,7 +2365,8 @@ def tight_layout(self, renderer=None, pad=1.08, h_pad=None, w_pad=None,`
`2358`	`2365`	`kwargs=get_tight_layout_figure(`
`2359`	`2366`	`self,self.axes,subplotspec_list,renderer,`
`2360`	`2367`	`pad=pad,h_pad=h_pad,w_pad=w_pad,rect=rect)`
`2361`		`-self.subplots_adjust(**kwargs)`
	`2368`	`+ifkwargsisnotNone:`
	`2369`	`+self.subplots_adjust(**kwargs)`
`2362`	`2370`
`2363`	`2371`	`defalign_xlabels(self,axs=None):`
`2364`	`2372`	`"""`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,8 @@ def tight_layout(self, figure, renderer=None,`
`326`	`326`	`kwargs=tight_layout.get_tight_layout_figure(`
`327`	`327`	`figure,figure.axes,subplotspec_list,renderer,`
`328`	`328`	`pad=pad,h_pad=h_pad,w_pad=w_pad,rect=rect)`
`329`		`-self.update(**kwargs)`
	`329`	`+ifkwargsisnotNone:`
	`330`	`+self.update(**kwargs)`
`330`	`331`
`331`	`332`
`332`	`333`	`classGridSpecFromSubplotSpec(GridSpecBase):`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -176,11 +176,13 @@ def auto_adjust_subplotpars(`
`176`	`176`	`margin_right=0.4999`
`177`	`177`	`warnings.warn('The left and right margins cannot be made large '`
`178`	`178`	`'enough to accommodate all axes decorations. ')`
	`179`	`+returnNone`
`179`	`180`	`ifmargin_bottom+margin_top>=1:`
`180`	`181`	`margin_bottom=0.4999`
`181`	`182`	`margin_top=0.4999`
`182`	`183`	`warnings.warn('The bottom and top margins cannot be made large '`
`183`	`184`	`'enough to accommodate all axes decorations. ')`
	`185`	`+returnNone`
`184`	`186`
`185`	`187`	`kwargs=dict(left=margin_left,`
`186`	`188`	`right=1-margin_right,`
`@@ -354,6 +356,8 @@ def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,`
`354`	`356`	`subplot_list=subplot_list,`
`355`	`357`	`ax_bbox_list=ax_bbox_list,`
`356`	`358`	`pad=pad,h_pad=h_pad,w_pad=w_pad)`
	`359`	`+ifkwargsisNone:`
	`360`	`+returnNone`
`357`	`361`
`358`	`362`	`ifrectisnotNone:`
`359`	`363`	`# if rect is given, the whole subplots area (including`
`@@ -384,5 +388,7 @@ def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,`
`384`	`388`	`ax_bbox_list=ax_bbox_list,`
`385`	`389`	`pad=pad,h_pad=h_pad,w_pad=w_pad,`
`386`	`390`	`rect=(left,bottom,right,top))`
	`391`	`+ifkwargsisNone:`
	`392`	`+returnNone`
`387`	`393`
`388`	`394`	`returnkwargs`

Comments

(0)