fix

eendebakpt · eendebakpt · commit 5708dc8dae7e · 2026-04-18T14:12:08.000+02:00
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -667,6 +667,9 @@ def __init__(self, axes, *, pickradius=15, clear=True):
         # Initialize here for testing; later add API
         self._major_tick_kw = dict()
         self._minor_tick_kw = dict()
+        # Populated by ``Axis.clear`` / ``_reset_{major,minor}_tick_kw``.
+        self._major_rcparams_snapshot = {}
+        self._minor_rcparams_snapshot = {}
 
         if clear:
             self.clear()
@@ -881,7 +884,13 @@ def _tick_kw_from_rcparams(self, major):
         into the kw dict at init/clear time restores parity with that
         pre-lazy path.
         """
-        name = f"{self.axis_name}tick"  # 'xtick' or 'ytick'
+        # `Tick.__init__` uses the tick class's ``__name__`` class attribute
+        # ('xtick'/'ytick') as the rcParam prefix; walk the MRO to find it
+        # (polar's ThetaTick/RadialTick inherit it from XTick/YTick, and
+        # ``cls.__name__`` on the class itself is still the Python class name).
+        name = next(c.__dict__['__name__']
+                    for c in self._tick_class.__mro__
+                    if '__name__' in c.__dict__)
         major_minor = "major" if major else "minor"
         rc = mpl.rcParams
         labelcolor = rc[f"{name}.labelcolor"]
@@ -907,10 +916,14 @@ def _tick_kw_from_rcparams(self, major):
         }
 
     def _reset_major_tick_kw(self):
-        self._major_tick_kw = self._tick_kw_from_rcparams(major=True)
+        # Wipe explicit user overrides; refresh the rcParams snapshot so a
+        # subsequent tick materialization uses the *current* rcParams.
+        self._major_tick_kw.clear()
+        self._major_rcparams_snapshot = self._tick_kw_from_rcparams(major=True)
 
     def _reset_minor_tick_kw(self):
-        self._minor_tick_kw = self._tick_kw_from_rcparams(major=False)
+        self._minor_tick_kw.clear()
+        self._minor_rcparams_snapshot = self._tick_kw_from_rcparams(major=False)
 
     def clear(self):
         """
@@ -941,10 +954,12 @@ def clear(self):
         # Clear the callback registry for this axis, or it may "leak"
         self.callbacks = cbook.CallbackRegistry(signals=["units"])
 
-        # Snapshot rcParams-derived tick kwargs so lazily-materialized
-        # Ticks see the same values the eager (pre-lazy) code path did.
-        self._reset_major_tick_kw()
-        self._reset_minor_tick_kw()
+        # Capture rcParams-derived tick kwargs at clear-time so that a
+        # lazily-materialized Tick sees the same values an eager one would
+        # have. User-set overrides in ``_{major,minor}_tick_kw`` persist
+        # across clear (tested by ``test_axes_clear_behavior``).
+        self._major_rcparams_snapshot = self._tick_kw_from_rcparams(major=True)
+        self._minor_rcparams_snapshot = self._tick_kw_from_rcparams(major=False)
         self.reset_ticks()
 
         self._converter = None
@@ -1707,8 +1722,14 @@ def _get_tick(self, major):
             raise NotImplementedError(
                 f"The Axis subclass {self.__class__.__name__} must define "
                 "_tick_class or reimplement _get_tick()")
-        tick_kw = self._major_tick_kw if major else self._minor_tick_kw
-        return self._tick_class(self.axes, 0, major=major, **tick_kw)
+        # Merge the rcParams snapshot (captured at Axis.clear-time, so it
+        # reflects any ``rc_context`` / ``plt.xkcd()`` active then) with
+        # explicit overrides from ``set_tick_params``; overrides win.
+        snapshot = (self._major_rcparams_snapshot if major
+                    else self._minor_rcparams_snapshot)
+        overrides = self._major_tick_kw if major else self._minor_tick_kw
+        return self._tick_class(self.axes, 0, major=major,
+                                **{**snapshot, **overrides})
 
     def _get_tick_label_size(self, axis_name):
         """
