Merge pull request #25131 from greglucas/modifier-tk

anntzer · web-flow · commit 7100e9ef4766 · 2023-02-05T14:38:16.000+01:00
FIX: Correctly report command keypress on mac for Tk + Gtk
diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py
@@ -354,7 +354,7 @@ def _mpl_modifiers(event, *, exclude=None):
             ("ctrl", 1 << 2, "control"),
             ("alt", 1 << 4, "alt"),
             ("shift", 1 << 0, "shift"),
-            ("super", 1 << 3, "super"),
+            ("cmd", 1 << 3, "cmd"),
         ] if sys.platform == "darwin" else [
             ("ctrl", 1 << 2, "control"),
             ("alt", 1 << 3, "alt"),
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -2169,6 +2169,9 @@ def _unikey_or_keysym_to_mplkey(unikey, keysym):
         key = key.replace("page_", "page")
     if key.endswith(("_l", "_r")):  # alt_l, ctrl_l, shift_l.
         key = key[:-2]
+    if sys.platform == "darwin" and key == "meta":
+        # meta should be reported as command on mac
+        key = "cmd"
     key = {
         "return": "enter",
         "prior": "pageup",  # Used by tk.
