Cache ticks within get_tightbbox

scottshambaugh · scottshambaugh · commit d8edeb796637 · 2026-02-04T14:30:47.000-07:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1388,17 +1388,18 @@ def get_tightbbox(self, renderer=None, *, for_layout_only=False):
             return
         if renderer is None:
             renderer = self.get_figure(root=True)._get_renderer()
-        # 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.
+        # We need to reset the ticks cache 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)
+        ticks_to_draw = self._update_ticks(_use_cache=True)
+
+        self._update_label_position(renderer, _use_cache=True)
 
         # go back to just this axis's tick labels
         tlb1, tlb2 = self._get_ticklabel_bboxes(ticks_to_draw, renderer,
-                                                _use_cache=False)
+                                                _use_cache=True)
 
         self._update_offset_text_position(tlb1, tlb2)
         self.offsetText.set_text(self.major.formatter.get_offset())
@@ -1424,6 +1425,8 @@ def get_tightbbox(self, renderer=None, *, for_layout_only=False):
                     bb.y1 = bb.y0 + 1.0
             bboxes.append(bb)
         bboxes = [b for b in bboxes if b._is_finite()]
+        self._clear_ticks_cache()
+
         if bboxes:
             return mtransforms.Bbox.union(bboxes)
         else:
@@ -1445,6 +1448,8 @@ def draw(self, renderer):
             return
         renderer.open_group(__name__, gid=self.get_gid())
 
+        self._clear_ticks_cache()
+
         ticks_to_draw = self._update_ticks(_use_cache=True)
         tlb1, tlb2 = self._get_ticklabel_bboxes(ticks_to_draw, renderer,
                                                 _use_cache=True)
@@ -1461,10 +1466,8 @@ def draw(self, renderer):
         self.offsetText.draw(renderer)
 
         renderer.close_group(__name__)
-        self.stale = False
-
-        # Reset cached values for next draw cycle, in case not called by Axes.draw()
         self._clear_ticks_cache()
+        self.stale = False
 
     def get_gridlines(self):
         r"""Return this Axis' grid lines as a list of `.Line2D`\s."""
diff --git a/lib/mpl_toolkits/mplot3d/axis3d.py b/lib/mpl_toolkits/mplot3d/axis3d.py
@@ -569,6 +569,7 @@ def draw(self, renderer):
         self.label._transform = self.axes.transData
         self.offsetText._transform = self.axes.transData
         renderer.open_group("axis3d", gid=self.get_gid())
+        self._clear_ticks_cache()
 
         # Get general axis information:
         mins, maxs, tc, highs = self._get_coord_info()
@@ -629,7 +630,6 @@ def draw(self, renderer):
         renderer.close_group('axis3d')
         self.stale = False
 
-        # Reset cached values for next draw cycle, in case not called by Axes3D.draw()
         self._clear_ticks_cache()
 
     @artist.allow_rasterization
