Code review changes

scottshambaugh · scottshambaugh · commit 44a6d28305c0 · 2022-09-07T20:47:41.000-06:00
diff --git a/doc/users/next_whats_new/3d_plot_pan_zoom.rst b/doc/users/next_whats_new/3d_plot_pan_zoom.rst
@@ -2,7 +2,7 @@
 ----------------------------
 
 The pan and zoom buttons in the toolbar of 3D plots are now enabled.
-Deselect both to rotate the plot. When the zoom button is pressed,
+Unselect both to rotate the plot. When the zoom button is pressed,
 zoom in by using the left mouse button to draw a bounding box, and
 out by using the right mouse button to draw the box. When zooming a
 3D plot, the current view aspect ratios are kept fixed.
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -31,7 +31,6 @@
 import matplotlib.transforms as mtransforms
 from matplotlib.axes import Axes
 from matplotlib.axes._base import _axis_method_wrapper, _process_plot_format
-from matplotlib.backend_bases import _Mode
 from matplotlib.transforms import Bbox
 from matplotlib.tri.triangulation import Triangulation
 
@@ -1012,7 +1011,9 @@ def _button_press(self, event):
     def _button_release(self, event):
         self.button_pressed = None
         toolbar = getattr(self.figure.canvas, "toolbar")
-        if toolbar and toolbar.mode not in (_Mode.PAN, _Mode.ZOOM):
+        # backend_bases.release_zoom and backend_bases.release_pan call
+        # push_current, so check the navigation mode so we don't call it twice
+        if toolbar and self.get_navigate_mode() is None:
             self.figure.canvas.toolbar.push_current()
 
     def _get_view(self):
@@ -1162,7 +1163,7 @@ def drag_pan(self, button, key, x, y):
         if du == 0 and dv == 0:
             return
 
-        # Transform the pan from the view axes to the data axees
+        # Transform the pan from the view axes to the data axes
         R = np.array([self._view_u, self._view_v, self._view_w])
         R = -R / self._box_aspect * self._dist
         duvw_projected = R.T @ np.array([du, dv, dw])
