FIX: Don't apply tight_layout if axes collapse

jklymak · jklymak · commit 72c80f46a33d · 2018-10-15T15:41:25.000-07:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -2390,7 +2390,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:
+            self.subplots_adjust(**kwargs)
 
     def align_xlabels(self, axs=None):
         """
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -341,7 +341,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:
+            self.update(**kwargs)
 
 
 class GridSpecFromSubplotSpec(GridSpecBase):
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
@@ -172,15 +172,15 @@ def auto_adjust_subplotpars(
         margin_bottom += pad_inches / fig_height_inch
 
     if margin_left + margin_right >= 1:
-        margin_left = 0.4999
-        margin_right = 0.4999
-        warnings.warn('The left and right margins cannot be made large '
+        warnings.warn('Tight layout not applied. 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 '
+        warnings.warn('Tight layout not applied. '
+                      '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,
@@ -195,9 +195,10 @@ def auto_adjust_subplotpars(
         # axes widths:
         h_axes = (1 - margin_right - margin_left - hspace * (cols - 1)) / cols
         if h_axes < 0:
-            warnings.warn('tight_layout cannot make axes width small enough '
+            warnings.warn('Tight layout not applied. '
+                          'tight_layout cannot make axes width small enough '
                           'to accommodate all axes decorations')
-            kwargs["wspace"] = 0.5
+            return None
         else:
             kwargs["wspace"] = hspace / h_axes
 
@@ -206,9 +207,10 @@ def auto_adjust_subplotpars(
                   + vpad_inches / fig_height_inch)
         v_axes = (1 - margin_top - margin_bottom - vspace * (rows - 1)) / rows
         if v_axes < 0:
-            warnings.warn('tight_layout cannot make axes height small enough '
+            warnings.warn('Tight layout not applied. '
+                          'tight_layout cannot make axes height small enough '
                           'to accommodate all axes decorations')
-            kwargs["hspace"] = 0.5
+            return None
         else:
             kwargs["hspace"] = vspace / v_axes
 
