8000 Merge remote-tracking branch 'upstream/v1.2.x' · matplotlib/matplotlib@127f474 · GitHub
[go: up one dir, main page]
Skip to content

Commit 127f474

Browse files
mdboommdboom
committed
Merge remote-tracking branch 'upstream/v1.2.x'
Conflicts: lib/matplotlib/backends/backend_gtk.py lib/matplotlib/text.py
2 parents c2af7ad + 422712d commit 127f474

File tree

7 files changed

+21
-9
lines changed

7 files changed

+21
-9
lines changed

‎lib/matplotlib/backends/backend_gtk.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ def _get_key(self, event):
341341
[gdk.MOD1_MASK, 'alt'],
342342
[gdk.CONTROL_MASK, 'ctrl'], ):
343343
if event.state & key_mask:
344-
key = '%s+%s' % (prefix, key)
344+
key = '{0}+{1}'.format(prefix, key)
345345

346346
return key
347347

‎lib/matplotlib/backends/backend_gtk3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ def _get_key(self, event):
271271
]
272272
for key_mask, prefix in modifiers:
273273
if event.state & key_mask:
274-
key = '{}+{}'.format(prefix, key)
274+
key = '{0}+{1}'.format(prefix, key)
275275

276276
return key
277277

‎lib/matplotlib/backends/backend_gtk3agg.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,20 @@ def on_draw_event(self, widget, ctx):
5959
return False
6060

6161
def blit(self, bbox=None):
62+
# If bbox is None, blit the entire canvas to gtk. Otherwise
63+
# blit only the area defined by the bbox.
64+
if bbox is None:
65+
bbox = self.figure.bbox
66+
67+
allocation = self.get_allocation()
68+
w, h = allocation.width, allocation.height
69+
x = int(bbox.x0)
70+
y = h - int(bbox.y1)
71+
width = int(bbox.x1) - int(bbox.x0)
72+
height = int(bbox.y1) - int(bbox.y0)
73+
6274
self._bbox_queue.append(bbox)
63-
self.queue_draw()
75+
self.queue_draw_area(x, y, width, height)
6476

6577
def print_png(self, filename, *args, **kwargs):
6678
# Do this so we can save the resolution of figure in the PNG file

‎lib/matplotlib/backends/backend_qt4.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def _get_key( self, event ):
337337
# prepend the ctrl, alt, super keys if appropriate (sorted in that order)
338338
for modifier, prefix, Qt_key in self._modifier_keys:
339339
if event.key() != Qt_key and int(event.modifiers()) & modifier == modifier:
340-
key = u'{}+{}'.format(prefix, key)
340+
key = u'{0}+{1}'.format(prefix, key)
341341

342342
return key
343343

‎lib/matplotlib/backends/backend_tkagg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ def _get_key(self, event):
467467
# note, shift is not added to the keys as this is already accounted for
468468
for bitmask, prefix, key_name in modifiers:
469469
if event.state & (1 << bitmask) and key_name not in key:
470-
key = '{}+{}'.format(prefix, key)
470+
key = '{0}+{1}'.format(prefix, key)
471471

472472
return key
473473

‎lib/matplotlib/backends/backend_wx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,7 @@ def _get_key(self, evt):
12501250
[evt.AltDown, 'alt'],
12511251
[evt.ControlDown, 'ctrl'], ):
12521252
if meth():
1253-
key = '{}+{}'.format(prefix, key)
1253+
key = '{0}+{1}'.format(prefix, key)
12541254

12551255
return key
12561256

‎lib/matplotlib/text.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ def draw(self, renderer):
541541
self._renderer = renderer
542542
if not self.get_visible():
543543
return
544-
if self.get_text() == '':
544+
if self.get_text().strip() == '':
545545
return
546546

547547
renderer.open_group('text', self.get_gid())
@@ -755,7 +755,7 @@ def get_window_extent(self, renderer=None, dpi=None):
755755
if dpi is not None:
756756
dpi_orig = self.figure.dpi
757757
self.figure.dpi = dpi
758-
if self.get_text() == '':
758+
if self.get_text().strip() == '':
759759
tx, ty = self._get_xy_display()
760760
return Bbox.from_bounds(tx, ty, 0, 0)
761761

@@ -1926,7 +1926,7 @@ def _update_position_xytext(self, renderer, xy_pixel):
19261926
props = props.copy()
19271927
pad = props.pop('pad', 4)
19281928
pad = renderer.points_to_pixels(pad)
1929-
if self.get_text() == "":
1929+
if self.get_text().strip() == "":
19301930
self.arrow_patch.set_patchA(None)
19311931
return
19321932

0 commit comments

Comments
 (0)
0