using key_press_handler_id as flag for toolmanager

Federico Ariza · Federico Ariza · commit bd8dd06fde0d · 2019-05-27T14:18:00.000-04:00
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -856,7 +856,8 @@ def _notify_change_observers(self):
 
     def begin_typing(self, x):
         self.capturekeystrokes = True
-        if rcParams['toolbar'] != 'toolmanager':
+        # Check for toolmanager handling the keypress
+        if self.ax.figure.canvas.manager.key_press_handler_id is not None:
             # disable command keys so that the user can type without
             # command keys causing figure to be saved, etc
             self.reset_params = {}
@@ -872,7 +873,8 @@ def stop_typing(self):
         # user's code, we only want to call it once we've already done
         # our cleanup.
         if self.capturekeystrokes:
-            if rcParams['toolbar'] != 'toolmanager':
+            # Check for toolmanager handling the keypress
+            if self.ax.figure.canvas.manager.key_press_handler_id is not None:
                 # since the user is no longer typing,
                 # reactivate the standard command keys
                 for key in self.params_to_disable:
