Extra ticks cache guard for get_tightbbox

scottshambaugh · scottshambaugh · commit 3e76904fbc65 · 2026-01-22T14:16:36.000-07:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -3201,8 +3201,7 @@ def draw(self, renderer):
 
         # Clear axis tick caches for this draw cycle
         for _axis in self._axis_map.values():
-            _axis._cached_ticks_to_draw = None
-            _axis._cached_ticklabel_bboxes = None
+            _axis._clear_ticks_cache()
 
         if not self.axison:
             for _axis in self._axis_map.values():
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1281,6 +1281,10 @@ def _set_artist_props(self, a):
             return
         a.set_figure(self.get_figure(root=False))
 
+    def _clear_ticks_cache(self):
+        self._cached_ticks_to_draw = None
+        self._cached_ticklabel_bboxes = None
+
     def _update_ticks(self, *, _use_cache=False):
         """
         Update ticks (position and labels) using the current data interval of
@@ -1375,6 +1379,7 @@ def get_tightbbox(self, renderer=None, *, for_layout_only=False):
         # Don't use cached values here - get_tightbbox() is called during
         # layout calculations (e.g., constrained_layout) outside of draw(),
         # and must always recalculate to reflect current state.
+        self._clear_ticks_cache()
         ticks_to_draw = self._update_ticks(_use_cache=False)
 
         self._update_label_position(renderer, _use_cache=False)
@@ -1447,8 +1452,7 @@ def draw(self, renderer):
         self.stale = False
 
         # Reset cached values for next draw cycle, in case not called by Axes.draw()
-        self._cached_ticks_to_draw = None
-        self._cached_ticklabel_bboxes = None
+        self._clear_ticks_cache()
 
     def get_gridlines(self):
         r"""Return this Axis' grid lines as a list of `.Line2D`\s."""
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -451,8 +451,7 @@ def draw(self, renderer):
 
         if self._axis3don:
             for axis in self._axis_map.values():
-                axis._cached_ticks_to_draw = None
-                axis._cached_ticklabel_bboxes = None
+                axis._clear_ticks_cache()
             # Draw panes first
             for axis in self._axis_map.values():
                 axis.draw_pane(renderer)
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -630,8 +630,7 @@ def draw(self, renderer):
         self.stale = False
 
         # Reset cached values for next draw cycle, in case not called by Axes3D.draw()
-        self._cached_ticks_to_draw = None
-        self._cached_ticklabel_bboxes = None
+        self._clear_ticks_cache()
 
     @artist.allow_rasterization
     def draw_grid(self, renderer):
