Fix matplotlib#5281: Include ticks in tight bounding box

mdboom · Nov 17, 2015 · 4534759 · 4534759
1 parent f924f39
commit 4534759
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
@@ -1049,7 +1049,6 @@ def _get_tick_bboxes(self, ticks, renderer):
         Given the list of ticks, return two lists of bboxes. One for
         tick lable1's and another for tick label2's.
         """
-
         ticklabelBoxes = []
         ticklabelBoxes2 = []
 
@@ -1065,7 +1064,7 @@ def _get_tick_bboxes(self, ticks, renderer):
     def get_tightbbox(self, renderer):
         """
         Return a bounding box that encloses the axis. It only accounts
-        tick labels, axis label, and offsetText.
+        tick labels, axis label, offsetText and ticks.
         """
         if not self.get_visible():
             return
@@ -1088,6 +1087,10 @@ def get_tightbbox(self, renderer):
         bb.extend(ticklabelBoxes)
         bb.extend(ticklabelBoxes2)
 
+        bb.extend(
+            tick._get_tick2line().get_window_extent(renderer)
+            for tick in ticks_to_draw)
+
         bb = [b for b in bb if b.width != 0 or b.height != 0]
         if bb:
             _bbox = mtransforms.Bbox.union(bb)

diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -568,7 +568,7 @@ def get_window_extent(self, renderer):
                                  ignore=True)
         # correct for marker size, if any
         if self._marker:
-            ms = (self._markersize / 72.0 * self.figure.dpi) * 0.5
+            ms = (self._markersize / 72.0 * self.figure.dpi)
             bbox = bbox.padded(ms)
         return bbox