matplotlib
diff --git a/‎lib/matplotlib/projections/polar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/projections/polar.py
+43-11Lines changed: 43 additions & 11 deletions b/‎lib/matplotlib/projections/polar.py
Copy file name to clipboardExpand all lines: lib/matplotlib/projections/polar.py
+43-11Lines changed: 43 additions & 11 deletions
@@ -5,6 +5,7 @@
 
 import numpy as np
 
+import matplotlib.artist as martist
 from matplotlib.axes import Axes
 import matplotlib.axis as maxis
 from matplotlib import cbook
@@ -378,8 +379,29 @@ class _ThetaTick(maxis.XTick):
     This subclass of `XTick` provides angular ticks with some small
     modification to their re-positioning such that ticks are rotated based on
     tick location. This results in ticks that are correctly perpendicular to
-    the arc spine. Labels are also rotated to be parallel to the spine.
+    the arc spine.
+
+    Labels are also rotated to be parallel to the spine. The label padding is
+    also applied here since it's not possible to use a generic axes transform
+    to produce tick-specific padding.
     """
+    def __init__(self, axes, *args, **kwargs):
+        maxis.XTick.__init__(self, axes, *args, **kwargs)
+        self._text1_translate = mtransforms.ScaledTranslation(
+            0, 0,
+            axes.figure.dpi_scale_trans)
+        self._text2_translate = mtransforms.ScaledTranslation(
+            0, 0,
+            axes.figure.dpi_scale_trans)
+
+    def _update_padding(self, angle):
+        padx = self._pad * np.cos(angle) / 72
+        pady = self._pad * np.sin(angle) / 72
+        self._text1_translate._t = (padx, pady)
+        self._text1_translate.invalidate()
+        self._text2_translate._t = (-padx, -pady)
+        self._text2_translate.invalidate()
+
     def _get_text1(self):
         t = maxis.XTick._get_text1(self)
         t.set_rotation_mode('anchor')
@@ -422,6 +444,23 @@ def update_position(self, loc):
         if self.label2On:
             self.label2.set_rotation(np.rad2deg(angle) + self._labelrotation)
 
+    @martist.allow_rasterization
+    def draw(self, renderer):
+        axes = self.axes
+        self._update_padding(self._loc * axes.get_theta_direction() +
+                             axes.get_theta_offset())
+
+        # Add the padding shift to the label. This can't be applied to the
+        # transform by default because Axis likes to copy ticks/transforms,
+        # leaving every one with the same padding direction.
+        trans1 = self.label1.get_transform()
+        self.label1.set_transform(trans1 + self._text1_translate)
+        trans2 = self.label2.get_transform()
+        self.label2.set_transform(trans2 + self._text2_translate)
+        maxis.XTick.draw(self, renderer)
+        self.label1.set_transform(trans1)
+        self.label2.set_transform(trans2)
+
 
 class _ThetaAxis(maxis.XAxis):
     """
@@ -736,14 +775,7 @@ def _set_lim_and_transforms(self):
             .translate(0.0, -0.5) \
             .scale(1.0, -1.0) \
             .translate(0.0, 0.5)
-        self._xaxis_text1_transform = (
-            flipr_transform +
-            mtransforms.Affine2D().translate(0.0, 0.1) +
-            self._xaxis_transform)
-        self._xaxis_text2_transform = (
-            flipr_transform +
-            mtransforms.Affine2D().translate(0.0, -0.1) +
-            self._xaxis_transform)
+        self._xaxis_text_transform = flipr_transform + self._xaxis_transform
 
         # This is the transform for r-axis ticks.  It scales the theta
         # axis so the gridlines from 0.0 to 1.0, now go from thetamin to
@@ -766,10 +798,10 @@ def get_xaxis_transform(self, which='grid'):
         return self._xaxis_transform
 
     def get_xaxis_text1_transform(self, pad):
-        return self._xaxis_text1_transform, 'bottom', 'center'
+        return self._xaxis_text_transform, 'bottom', 'center'
 
     def get_xaxis_text2_transform(self, pad):
-        return self._xaxis_text2_transform, 'top', 'center'
+        return self._xaxis_text_transform, 'top', 'center'
 
     def get_yaxis_transform(self, which='grid'):
         if which in ('tick1', 'tick2'):