Merge pull request matplotlib#128 from mdboom/gtk-hexbin-crash

mdboom · mdboom · commit e3499bcb7fa6 · 2012-06-13T05:37:17.000-07:00
hexbin_demo.py crashes with gtk backend
diff --git a/lib/matplotlib/backends/backend_gdk.py b/lib/matplotlib/backends/backend_gdk.py
@@ -142,7 +142,7 @@ def draw_image(self, gc, x, y, im):
     def draw_text(self, gc, x, y, s, prop, angle, ismath):
         x, y = int(x), int(y)
 
-        if x <0 or y <0: # window has shrunk and text is off the edge
+        if x < 0 or y < 0: # window has shrunk and text is off the edge
             return
 
         if angle not in (0,90):
@@ -157,6 +157,9 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         else:
             layout, inkRect, logicalRect = self._get_pango_layout(s, prop)
             l, b, w, h = inkRect
+            if (x + w > self.width or y + h > self.height):
+                return
+
             self.gdkDrawable.draw_layout(gc.gdkGC, x, y-h-b, layout)
 
 
@@ -225,7 +228,8 @@ def _draw_rotated_text(self, gc, x, y, s, prop, angle):
         x = int(x-h)
         y = int(y-w)
 
-        if x < 0 or y < 0: # window has shrunk and text is off the edge
+        if (x < 0 or y < 0 or: # window has shrunk and text is off the edge
+            x + w > self.width or y + h > self.height):
             return
 
         key = (x,y,s,angle,hash(prop))
