Merge pull request matplotlib#7119 from efiring/tick_length_and_labels

BUG: adjust tick label location when tick length changes

Author: NelleV

lib/matplotlib/axis.py

@@ -300,33 +300,33 @@ def _apply_params(self, **kw):
         switches = [k for k in kw if k in switchkw]
         for k in switches:
             setattr(self, k, kw.pop(k))
-        dirpad = [k for k in kw if k in ['pad', 'tickdir']]
-        if dirpad:
+        newmarker = [k for k in kw if k in ['size', 'width', 'pad', 'tickdir']]
+        if newmarker:
+            self._size = kw.pop('size', self._size)
+            # Width could be handled outside this block, but it is
+            # convenient to leave it here.
+            self._width = kw.pop('width', self._width)
             self._base_pad = kw.pop('pad', self._base_pad)
+            # apply_tickdir uses _size and _base_pad to make _pad,
+            # and also makes _tickmarkers.
             self.apply_tickdir(kw.pop('tickdir', self._tickdir))
+            self.tick1line.set_marker(self._tickmarkers[0])
+            self.tick2line.set_marker(self._tickmarkers[1])
+            for line in (self.tick1line, self.tick2line):
+                line.set_markersize(self._size)
+                line.set_markeredgewidth(self._width)
+            # _get_text1_transform uses _pad from apply_tickdir.
             trans = self._get_text1_transform()[0]
             self.label1.set_transform(trans)
             trans = self._get_text2_transform()[0]
             self.label2.set_transform(trans)
-            self.tick1line.set_marker(self._tickmarkers[0])
-            self.tick2line.set_marker(self._tickmarkers[1])
         tick_kw = dict([kv for kv in six.iteritems(kw)
                         if kv[0] in ['color', 'zorder']])
         if tick_kw:
             self.tick1line.set(**tick_kw)
             self.tick2line.set(**tick_kw)
             for k, v in six.iteritems(tick_kw):
                 setattr(self, '_' + k, v)
-        tick_list = [kv for kv
-                     in six.iteritems(kw) if kv[0] in ['size', 'width']]
-        for k, v in tick_list:
-            setattr(self, '_' + k, v)
-            if k == 'size':
-                self.tick1line.set_markersize(v)
-                self.tick2line.set_markersize(v)
-            else:
-                self.tick1line.set_markeredgewidth(v)
-                self.tick2line.set_markeredgewidth(v)
         label_list = [k for k in six.iteritems(kw)
                       if k[0] in ['labelsize', 'labelcolor']]
         if label_list: