From ccf06fffbcdc6895732491dec68c3136e8785432 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Mon, 10 Jan 2022 09:52:19 -0800 Subject: UI: Allow AltGr Key + C,V,X Text Input Slight change to our processing of Ctrl-C, Ctrl-V, and Ctrl-X so that they will not be triggered if Alt is also pressed. This allows entry of AltGr-C, -V, -X when using International keyboard layouts. See D13781 for more details Differential Revision: https://developer.blender.org/D13781 Reviewed by Brecht Van Lommel --- source/blender/editors/interface/interface_handlers.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/interface/interface_handlers.c') diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 7521ccf4e4c..6ecaead67ce 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3762,7 +3762,12 @@ static void ui_do_but_textedit( case EVT_VKEY: case EVT_XKEY: case EVT_CKEY: - if (IS_EVENT_MOD(event, ctrl, oskey)) { +#if defined(__APPLE__) + if ((event->oskey && !IS_EVENT_MOD(event, shift, alt, ctrl)) || + (event->ctrl && !IS_EVENT_MOD(event, shift, alt, oskey))) { +#else + if (event->ctrl && !IS_EVENT_MOD(event, shift, alt, oskey)) { +#endif if (event->type == EVT_VKEY) { changed = ui_textedit_copypaste(but, data, UI_TEXTEDIT_PASTE); } -- cgit v1.2.3