summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2021-09-15 11:48:54 +0200
committerRémi Verschelde <rverschelde@gmail.com>2021-09-15 11:48:54 +0200
commit07a58230ea8cdc1f74356967924433cf543bd023 (patch)
tree7ab086f72b03a244feae73ba7ce7f96e019ddb2a /core
parent453aff4902d1fd4c82df2ca39b2258bc6d21dd90 (diff)
InputMap: Fixup `macos` feature tag overrides after #52291
Fixes #52691.
Diffstat (limited to 'core')
-rw-r--r--core/input/input_map.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp
index a17faafc0c..c6db7be53a 100644
--- a/core/input/input_map.cpp
+++ b/core/input/input_map.cpp
@@ -703,11 +703,11 @@ void InputMap::load_default() {
OrderedHashMap<String, List<Ref<InputEvent>>> builtins = get_builtins();
// List of Builtins which have an override for macOS.
- Vector<String> osx_builtins;
+ Vector<String> macos_builtins;
for (OrderedHashMap<String, List<Ref<InputEvent>>>::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;
}