Text should take up a pixel of window extent when invisible

brunobeltran · brunobeltran · commit 062d54a152d4 · 2020-10-19T17:42:56.000-07:00
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.null()
+            return Bbox.unit()
         if dpi is None:
             dpi = self.figure.dpi
         if self.get_text() == '':
@@ -1959,7 +1959,7 @@ 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() or not self._check_xy(renderer):
-            return Bbox.null()
+            return Bbox.unit()
         if renderer is not None:
             self._renderer = renderer
         if self._renderer is None:
@@ -1977,5 +1977,11 @@ def get_window_extent(self, renderer=None):
 
         return Bbox.union(bboxes)
 
+    def get_tightbbox(self, renderer):
+        # docstring inherited
+        if not self._check_xy(renderer):
+            return Bbox.null()
+        return super().get_tightbbox(renderer)
+
 
 docstring.interpd.update(Annotation=Annotation.__init__.__doc__)
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
@@ -68,17 +68,8 @@ def auto_adjust_subplotpars(
 
     if ax_bbox_list is None:
         ax_bbox_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
-        ]
+            Bbox.union([ax.get_position(original=True) for ax in subplots])
+            for subplots in subplot_list]
 
     for subplots, ax_bbox, (num1, num2) in zip(subplot_list,
                                                ax_bbox_list,
