[Bf-blender-cvs] [939e4030b11] master: Fix T64655: Quad view toggle conflicts on macOS

[Campbell Barton]

Commit: 939e4030b1168cacf0d0f8f64a1ed51c535e397c
Author: Campbell Barton
Date:   Wed Nov 27 00:34:46 2019 +1100
Branches: master
https://developer.blender.org/rB939e4030b1168cacf0d0f8f64a1ed51c535e397c

Fix T64655: Quad view toggle conflicts on macOS

Cmd-Alt-Q is a system shortcut on macOS, use Ctrl-Alt-Q.

===================================================================

M	release/scripts/modules/bl_keymap_utils/platform_helpers.py

===================================================================

diff --git a/release/scripts/modules/bl_keymap_utils/platform_helpers.py b/release/scripts/modules/bl_keymap_utils/platform_helpers.py
index 064c8b1d171..e18a902c562 100644
--- a/release/scripts/modules/bl_keymap_utils/platform_helpers.py
+++ b/release/scripts/modules/bl_keymap_utils/platform_helpers.py
@@ -39,19 +39,25 @@ def keyconfig_data_oskey_from_ctrl(keyconfig_data_src, filter_fn=None):
 def keyconfig_data_oskey_from_ctrl_for_macos(keyconfig_data_src):
     """Use for apple since Cmd is typically used in-place of Ctrl."""
     def filter_fn(item_event):
-        if (item_event["type"] in {
-                'H',
-                'M',
-                'SPACE',
-                'W',
-                'ACCENT_GRAVE',
-                'PERIOD',
-        }) and (
-            item_event.get("ctrl") and
-            (not item_event.get("alt")) and
-            (not item_event.get("shift"))
-        ):
-            return False
+        if item_event.get("ctrl"):
+            event_type = item_event["type"]
+            # Ctrl-{Key}
+            if (event_type in {
+                    'H',
+                    'M',
+                    'SPACE',
+                    'W',
+                    'ACCENT_GRAVE',
+                    'PERIOD',
+            }):
+                if (not item_event.get("alt")) and (not item_event.get("shift")):
+                    return False
+            # Ctrl-Alt-{Key}
+            if (event_type in {
+                    'Q',
+            }):
+                if item_event.get("alt") and (not item_event.get("shift")):
+                    return False
         return True
 
     return keyconfig_data_oskey_from_ctrl(keyconfig_data_src, filter_fn)