matplotlib
diff --git a/‎doc/conf.py
Lines changed: 3 additions & 0 deletions b/‎doc/conf.py
Lines changed: 3 additions & 0 deletions
diff --git a/‎lib/matplotlib/backend_bases.py
Lines changed: 8 additions & 10 deletions b/‎lib/matplotlib/backend_bases.py
Lines changed: 8 additions & 10 deletions
diff --git a/‎lib/matplotlib/backends/qt_editor/figureoptions.py
Lines changed: 1 addition & 0 deletions b/‎lib/matplotlib/backends/qt_editor/figureoptions.py
Lines changed: 1 addition & 0 deletions
@@ -319,6 +319,9 @@ class QWidget(object):
         class QMainWindow(object):
             pass
 
+        class QPushButton(object):
+            pass
+
 
 class MySip(MagicMock):
     def getapi(*args):
 
@@ -39,6 +39,7 @@
 import six
 from six.moves import xrange
 
+from functools import partial
 import os
 import sys
 import warnings
@@ -2763,6 +2764,13 @@ def __init__(self, canvas):
         self.mode = ''  # a mode string for the status bar
         self.set_history_buttons()
 
+        @partial(canvas.mpl_connect, 'draw_event')
+        def define_home(event):
+            self.push_current()
+            # The decorator sets `define_home` to the callback cid, so we can
+            # disconnect it after the first use.
+            canvas.mpl_disconnect(define_home)
+
     def set_message(self, s):
         """Display a message on toolbar or in status bar"""
         pass
@@ -2913,11 +2921,6 @@ def press_pan(self, event):
             return
 
         x, y = event.x, event.y
-
-        # push the current view to define home if stack is empty
-        if self._views.empty():
-            self.push_current()
-
         self._xypress = []
         for i, a in enumerate(self.canvas.figure.get_axes()):
             if (x is not None and y is not None and a.in_axes(event) and
@@ -2953,11 +2956,6 @@ def press_zoom(self, event):
             return
 
         x, y = event.x, event.y
-
-        # push the current view to define home if stack is empty
-        if self._views.empty():
-            self.push_current()
-
         self._xypress = []
         for i, a in enumerate(self.canvas.figure.get_axes()):
             if (x is not None and y is not None and a.in_axes(event) and
 
@@ -234,6 +234,7 @@ def apply_callback(data):
         # Redraw
         figure = axes.get_figure()
         figure.canvas.draw()
+        figure.canvas.toolbar.push_current()
 
     data = formlayout.fedit(datalist, title="Figure options", parent=parent,
                             icon=get_icon('qt4_editor_options.svg'),