From 86626bbd72360b23f3011917d9d0960bf887ed22 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 18 Apr 2016 19:20:26 -0400 Subject: [PATCH] Switched key that maps to FUNC from command to option. Logic is that command may frequently be used for performing an action which changes the key window, in which case we won't realise if it is released. --- OSBindings/Mac/Clock Signal/Documents/ElectronDocument.swift | 1 + OSBindings/Mac/Clock Signal/Wrappers/CSElectron.mm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OSBindings/Mac/Clock Signal/Documents/ElectronDocument.swift b/OSBindings/Mac/Clock Signal/Documents/ElectronDocument.swift index 92c66b45d..bed4fa3d1 100644 --- a/OSBindings/Mac/Clock Signal/Documents/ElectronDocument.swift +++ b/OSBindings/Mac/Clock Signal/Documents/ElectronDocument.swift @@ -130,5 +130,6 @@ class ElectronDocument: MachineDocument { electron.setKey(VK_Shift, isPressed: newModifiers.modifierFlags.contains(.ShiftKeyMask)) electron.setKey(VK_Control, isPressed: newModifiers.modifierFlags.contains(.ControlKeyMask)) electron.setKey(VK_Command, isPressed: newModifiers.modifierFlags.contains(.CommandKeyMask)) + electron.setKey(VK_Option, isPressed: newModifiers.modifierFlags.contains(.AlternateKeyMask)) } } diff --git a/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.mm b/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.mm index 7900a4776..3943dc360 100644 --- a/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.mm +++ b/OSBindings/Mac/Clock Signal/Wrappers/CSElectron.mm @@ -134,7 +134,7 @@ case VK_Shift: _electron.set_key_state(Electron::Key::KeyShift, isPressed); break; case VK_Control: _electron.set_key_state(Electron::Key::KeyControl, isPressed); break; - case VK_Command: _electron.set_key_state(Electron::Key::KeyFunc, isPressed); break; + case VK_Option: _electron.set_key_state(Electron::Key::KeyFunc, isPressed); break; case VK_F12: _electron.set_key_state(Electron::Key::KeyBreak, isPressed); break;