Merge pull request #17540 from QuLogic/fix-gtk-help

tacaswell · web-flow · commit e53a00cddd62 · 2020-06-01T23:59:36.000-04:00
FIX: help window on GTK.
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -430,7 +430,7 @@ class _ToolEnableNavigation(ToolBase):
     """Tool to enable a specific axes for toolmanager interaction."""
 
     description = 'Enable one axes toolmanager'
-    default_keymap = (1, 2, 3, 4, 5, 6, 7, 8, 9)
+    default_keymap = ('1', '2', '3', '4', '5', '6', '7', '8', '9')
 
     def trigger(self, sender, event, data=None):
         mpl.backend_bases.key_press_handler(event, self.figure.canvas, None)
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -824,6 +824,15 @@ def _normalize_shortcut(self, key):
 
         return ''.join(mods) + key
 
+    def _is_valid_shortcut(self, key):
+        """
+        Check for a valid shortcut to be displayed.
+
+        - GTK will never send 'cmd+' (see `FigureCanvasGTK3._get_key`).
+        - The shortcut window only shows keyboard shortcuts, not mouse buttons.
+        """
+        return 'cmd+' not in key and not key.startswith('MouseButton.')
+
     def _show_shortcuts_window(self):
         section = Gtk.ShortcutsSection()
 
@@ -844,8 +853,7 @@ def _show_shortcuts_window(self):
                 accelerator=' '.join(
                     self._normalize_shortcut(key)
                     for key in self.toolmanager.get_tool_keymap(name)
-                    # Will never be sent:
-                    if 'cmd+' not in key),
+                    if self._is_valid_shortcut(key)),
                 title=tool.name,
                 subtitle=tool.description)
             group.add(shortcut)
