Backport PR #9495: Macosx fixes

jklymak · MeeseeksDev[bot] · commit 37b7e302b761 · 2017-10-21T15:38:11.000Z
diff --git a/lib/matplotlib/backends/backend_macosx.py b/lib/matplotlib/backends/backend_macosx.py
@@ -1,8 +1,6 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
-import six
-
 import os
 
 from matplotlib._pylab_helpers import Gcf
@@ -99,14 +97,14 @@ def get_renderer(self, cleared=False):
     def _draw(self):
         renderer = self.get_renderer()
 
-        if not self.figure.stale:
-            return renderer
+        if self.figure.stale:
+            self.figure.draw(renderer)
 
-        self.figure.draw(renderer)
         return renderer
 
     def draw(self):
         self.invalidate()
+        self.flush_events()
 
     def draw_idle(self, *args, **kwargs):
         self.invalidate()
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -1206,6 +1206,7 @@ def _on_move(self, event):
             self.elev = art3d.norm_angle(self.elev - (dy/h)*180)
             self.azim = art3d.norm_angle(self.azim - (dx/w)*180)
             self.get_proj()
+            self.stale = True
             self.figure.canvas.draw_idle()
 
 #        elif self.button_pressed == 2:
