FIX: Stop tight layout collapsing under zoom

jklymak · jklymak · commit 70e7d185414b · 2018-07-22T19:45:31.000-07:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -2347,6 +2347,13 @@ def tight_layout(self, renderer=None, pad=1.08, h_pad=None, w_pad=None,
         from .tight_layout import (
             get_renderer, get_subplotspec_list, get_tight_layout_figure)
 
+        try:
+            if self.canvas.toolbar._active in ('PAN', 'ZOOM'):
+                # don't do tight layout during zoom and pan.
+                return
+        except AttributeError:
+            # not toolbar, or no _active attribute..
+            pass
         subplotspec_list = get_subplotspec_list(self.axes)
         if None in subplotspec_list:
             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,
         kwargs = get_tight_layout_figure(
             self, self.axes, subplotspec_list, renderer,
             pad=pad, h_pad=h_pad, w_pad=w_pad, rect=rect)
-        self.subplots_adjust(**kwargs)
+        if kwargs is not None:
+            self.subplots_adjust(**kwargs)
 
     def align_xlabels(self, axs=None):
         """
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -326,7 +326,8 @@ def tight_layout(self, figure, renderer=None,
         kwargs = tight_layout.get_tight_layout_figure(
             figure, figure.axes, subplotspec_list, renderer,
             pad=pad, h_pad=h_pad, w_pad=w_pad, rect=rect)
-        self.update(**kwargs)
+        if kwargs is not None:
+            self.update(**kwargs)
 
 
 class GridSpecFromSubplotSpec(GridSpecBase):
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
@@ -176,11 +176,13 @@ def auto_adjust_subplotpars(
         margin_right = 0.4999
         warnings.warn('The left and right margins cannot be made large '
                       'enough to accommodate all axes decorations. ')
+        return None
     if margin_bottom + margin_top >= 1:
         margin_bottom = 0.4999
         margin_top = 0.4999
         warnings.warn('The bottom and top margins cannot be made large '
                       'enough to accommodate all axes decorations. ')
+        return None
 
     kwargs = dict(left=margin_left,
                   right=1 - margin_right,
@@ -354,6 +356,8 @@ def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,
                                      subplot_list=subplot_list,
                                      ax_bbox_list=ax_bbox_list,
                                      pad=pad, h_pad=h_pad, w_pad=w_pad)
+    if kwargs is None:
+        return None
 
     if rect is not None:
         # if rect is given, the whole subplots area (including
@@ -384,5 +388,7 @@ def get_tight_layout_figure(fig, axes_list, subplotspec_list, renderer,
                                          ax_bbox_list=ax_bbox_list,
                                          pad=pad, h_pad=h_pad, w_pad=w_pad,
                                          rect=(left, bottom, right, top))
+        if kwargs is None:
+            return None
 
     return kwargs
