diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-17 17:38:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 17:38:02 +0200 |
| commit | 6c367f8e0d22ae5430d48dbbee9396345933e233 (patch) | |
| tree | 6ceafa9ee3010dca7a485e716614628670609f9b /platform/osx | |
| parent | 2fcfc83da91ca6c2e4670d3cdf01ee27d65f667b (diff) | |
| parent | 97fecd1b69e837a3e3300bb7209ef72131abe599 (diff) | |
Merge pull request #48168 from LightningAA/control-to-ctrl-4.0
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/display_server_osx.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/osx/display_server_osx.mm b/platform/osx/display_server_osx.mm index 0a232357b5..a9e9aa889a 100644 --- a/platform/osx/display_server_osx.mm +++ b/platform/osx/display_server_osx.mm @@ -66,10 +66,10 @@ static bool ignore_momentum_scroll = false; static void _get_key_modifier_state(unsigned int p_osx_state, Ref<InputEventWithModifiers> r_state) { - r_state->set_shift((p_osx_state & NSEventModifierFlagShift)); - r_state->set_control((p_osx_state & NSEventModifierFlagControl)); - r_state->set_alt((p_osx_state & NSEventModifierFlagOption)); - r_state->set_metakey((p_osx_state & NSEventModifierFlagCommand)); + r_state->set_shift_pressed((p_osx_state & NSEventModifierFlagShift)); + r_state->set_ctrl_pressed((p_osx_state & NSEventModifierFlagControl)); + r_state->set_alt_pressed((p_osx_state & NSEventModifierFlagOption)); + r_state->set_meta_pressed((p_osx_state & NSEventModifierFlagCommand)); } static Vector2i _get_mouse_pos(DisplayServerOSX::WindowData &p_wd, NSPoint p_locationInWindow) { @@ -1133,10 +1133,10 @@ static int translateKey(unsigned int key) { /* 38 */ KEY_SHIFT, /* 39 */ KEY_CAPSLOCK, /* 3a */ KEY_ALT, - /* 3b */ KEY_CONTROL, + /* 3b */ KEY_CTRL, /* 3c */ KEY_SHIFT, /* 3d */ KEY_ALT, - /* 3e */ KEY_CONTROL, + /* 3e */ KEY_CTRL, /* 3f */ KEY_UNKNOWN, /* Function */ /* 40 */ KEY_UNKNOWN, /* F17 */ /* 41 */ KEY_KP_PERIOD, |