mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-15 00:24:19 +00:00
Code Activity

Avoided function key presses sending a unicode character on OSX.

Browse source
This commit is contained in:
jules 2013-08-24 10:27:20 +01:00
parent fb6b0290db
commit bb2bdb2c7c
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm
View file

@ -632,9 +632,11 @@ public:
const String unicode (nsStringToJuce ([ev characters]));
const int keyCode = getKeyCodeFromEvent (ev);
//DBG ("unicode: " + unicode + " " + String::toHexString ((int) unicode[0]));
//String unmodified (nsStringToJuce ([ev charactersIgnoringModifiers]));
//DBG ("unmodified: " + unmodified + " " + String::toHexString ((int) unmodified[0]));
#if JUCE_DEBUG_KEYCODES
DBG ("unicode: " + unicode + " " + String::toHexString ((int) unicode[0]));
String unmodified (nsStringToJuce ([ev charactersIgnoringModifiers]));
DBG ("unmodified: " + unmodified + " " + String::toHexString ((int) unmodified[0]));
#endif
if (keyCode != 0 || unicode.isNotEmpty())
{
@ -661,7 +663,8 @@ public:
break; // (these all seem to generate unwanted garbage unicode strings)
default:
if (([ev modifierFlags] & NSCommandKeyMask) != 0)
if (([ev modifierFlags] & NSCommandKeyMask) != 0
|| (keyCode >= NSF1FunctionKey && keyCode <= NSF35FunctionKey))
textCharacter = 0;
break;
}