Merge pull request matplotlib#4763 from mdehoon/speedUpDrawIdle

tacaswell · tacaswell · commit 1513333ebad2 · 2015-07-23T10:08:33.000-04:00
PRF: Return from draw_idle as soon as possible
diff --git a/lib/matplotlib/backends/backend_gtk.py b/lib/matplotlib/backends/backend_gtk.py
@@ -372,14 +372,15 @@ def draw(self):
             self.window.process_updates (False)
 
     def draw_idle(self):
+        if self._idle_draw_id != 0:
+            return
         def idle_draw(*args):
             try:
                 self.draw()
             finally:
                 self._idle_draw_id = 0
             return False
-        if self._idle_draw_id == 0:
-            self._idle_draw_id = gobject.idle_add(idle_draw)
+        self._idle_draw_id = gobject.idle_add(idle_draw)
 
 
     def _renderer_init(self):
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -336,14 +336,15 @@ def draw(self):
             self.get_property("window").process_updates (False)
 
     def draw_idle(self):
+        if self._idle_draw_id != 0:
+            return
         def idle_draw(*args):
             try:
                 self.draw()
             finally:
                 self._idle_draw_id = 0
             return False
-        if self._idle_draw_id == 0:
-            self._idle_draw_id = GLib.idle_add(idle_draw)
+        self._idle_draw_id = GLib.idle_add(idle_draw)
 
     def new_timer(self, *args, **kwargs):
         """
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -363,16 +363,18 @@ def blit(self, bbox=None):
 
     def draw_idle(self):
         'update drawing area only if idle'
-        d = self._idle
+        if self._idle is False:
+            return
+
         self._idle = False
+
         def idle_draw(*args):
             try:
                 self.draw()
             finally:
                 self._idle = True
 
-        if d:
-            self._idle_callback = self._tkcanvas.after_idle(idle_draw)
+        self._idle_callback = self._tkcanvas.after_idle(idle_draw)
 
     def get_tk_widget(self):
         """returns the Tk widget used to implement FigureCanvasTkAgg.
