blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T64655: Quad view toggle conflicts on macOS 

Cmd-Alt-Q is a system shortcut on macOS, use Ctrl-Alt-Q.
This commit is contained in:
Campbell Barton 2019-11-27 00:34:46 +11:00
parent fcbec6e97e
commit 939e4030b1
Notes: blender-bot 2024-03-22 15:57:27 +01:00 
Referenced by issue #64655, Blender 2.8 Toggle Quad View Shortcut Does Not work on Mac OS Mojave
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
release/scripts/modules/bl_keymap_utils/platform_helpers.py
View File

@ -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)