From 07a58230ea8cdc1f74356967924433cf543bd023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 15 Sep 2021 11:48:54 +0200 Subject: [PATCH] InputMap: Fixup `macos` feature tag overrides after #52291 Fixes #52691. --- core/input/input_map.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp index a17faafc0cf..c6db7be53a0 100644 --- a/core/input/input_map.cpp +++ b/core/input/input_map.cpp @@ -703,11 +703,11 @@ void InputMap::load_default() { OrderedHashMap>> builtins = get_builtins(); // List of Builtins which have an override for macOS. - Vector osx_builtins; + Vector macos_builtins; for (OrderedHashMap>>::Element E = builtins.front(); E; E = E.next()) { if (String(E.key()).ends_with(".macos")) { // Strip .macos from name: some_input_name.macos -> some_input_name - osx_builtins.push_back(String(E.key()).split(".")[0]); + macos_builtins.push_back(String(E.key()).split(".")[0]); } } @@ -717,12 +717,12 @@ void InputMap::load_default() { String override_for = fullname.split(".").size() > 1 ? fullname.split(".")[1] : ""; #ifdef APPLE_STYLE_KEYS - if (osx_builtins.has(name) && override_for != "osx") { - // Name has `osx` builtin but this particular one is for non-macOS systems - so skip. + if (macos_builtins.has(name) && override_for != "macos") { + // Name has `macos` builtin but this particular one is for non-macOS systems - so skip. continue; } #else - if (override_for == "osx") { + if (override_for == "macos") { // Override for macOS - not needed on non-macOS platforms. continue; }