Skip to content

Commit 625632c

Browse files
committed
Merged revisions 8524,8526,8539,8541 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8524 | jdh2358 | 2010-07-06 17:54:21 -0400 (Tue, 06 Jul 2010) | 1 line add gridspec api to toc ........ r8526 | mdboom | 2010-07-07 09:19:29 -0400 (Wed, 07 Jul 2010) | 2 lines Backport of r8515: Reset clipping upon exit of draw_markers to avoid negative interaction with blitting. ........ r8539 | ryanmay | 2010-07-09 14:30:07 -0400 (Fri, 09 Jul 2010) | 1 line Fix setting of minor ticklabels. As far as I can tell, the extra call to set_major_formatter is due to an SVN merge error from the transforms branch. ........ r8541 | leejjoon | 2010-07-13 12:39:40 -0400 (Tue, 13 Jul 2010) | 1 line Text.draw uses _set_gc_clip to set clip property ........ svn path=/trunk/matplotlib/; revision=8542
1 parent 77a6860 commit 625632c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

doc/api/index.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
dates_api.rst
2626
figure_api.rst
2727
font_manager_api.rst
28-
nxutils_api.rst
28+
gridspec_api.rst
2929
mathtext_api.rst
3030
mlab_api.rst
3131
path_api.rst
3232
pyplot_api.rst
33+
nxutils_api.rst
3334
spine_api.rst
3435
ticker_api.rst
3536
units_api.rst

lib/matplotlib/text.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,7 @@ def draw(self, renderer):
541541
gc.set_foreground(self.get_color())
542542
gc.set_alpha(self.get_alpha())
543543
gc.set_url(self._url)
544-
if self.get_clip_on():
545-
gc.set_clip_rectangle(self.clipbox)
544+
self._set_gc_clip(gc)
546545

547546
if self._bbox:
548547
bbox_artist(self, renderer, self._bbox)

0 commit comments

Comments
 (0)