BF: text not "draw"n shouldn't count for tightbbox

brunobeltran · brunobeltran · commit 10a0c8fac958 · 2020-10-19T17:40:51.000-07:00
diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
@@ -288,13 +288,16 @@ def test_badsubplotgrid():
 
 
 def test_collapsed():
-    # test that if a call to tight_layout will collapses the axes that
-    # it does not get applied:
+    # test that if the amount of space required to make all the axes
+    # decorations fit would mean that the actual Axes would end up with size
+    # zero (i.e. margins add up to more than the available width) that a call
+    # to tight_layout will not get applied:
     fig, ax = plt.subplots(tight_layout=True)
     ax.set_xlim([0, 1])
     ax.set_ylim([0, 1])
 
-    ax.annotate('BIG LONG STRING', xy=(1.25, 2), xytext=(10.5, 1.75),)
+    ax.annotate('BIG LONG STRING', xy=(1.25, 2), xytext=(10.5, 1.75),
+                annotation_clip=False)
     p1 = ax.get_position()
     with pytest.warns(UserWarning):
         plt.tight_layout()
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -874,7 +874,7 @@ def get_window_extent(self, renderer=None, dpi=None):
         """
         #return _unit_box
         if not self.get_visible():
-            return Bbox.unit()
+            return Bbox.null()
         if dpi is None:
             dpi = self.figure.dpi
         if self.get_text() == '':
@@ -1958,8 +1958,8 @@ def get_window_extent(self, renderer=None):
         """
         # This block is the same as in Text.get_window_extent, but we need to
         # set the renderer before calling update_positions().
-        if not self.get_visible():
-            return Bbox.unit()
+        if not self.get_visible() or not self._check_xy(renderer):
+            return Bbox.null()
         if renderer is not None:
             self._renderer = renderer
         if self._renderer is None:
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
@@ -68,8 +68,17 @@ def auto_adjust_subplotpars(
 
     if ax_bbox_list is None:
         ax_bbox_list = [
-            Bbox.union([ax.get_position(original=True) for ax in subplots])
-            for subplots in subplot_list]
+            [ax.get_position(original=True) for ax in subplots]
+            for subplots in subplot_list
+        ]
+        ax_bbox_list = [
+            Bbox.union([
+                b for b in bbox_list
+                if np.isfinite(b.width) and np.isfinite(b.height)
+                    and (b.width != 0 or b.height != 0)
+            ])
+            for bbox_list in ax_bbox_list
+        ]
 
     for subplots, ax_bbox, (num1, num2) in zip(subplot_list,
                                                ax_bbox_list,
