godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

InputMap: Fixup macos feature tag overrides after #52291

Browse Source 
Fixes #52691.
This commit is contained in:
Rémi Verschelde
2021-09-15 11:48:54 +02:00
parent 453aff4902
commit 07a58230ea
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/input/input_map.cpp
View File

@@ -703,11 +703,11 @@ void InputMap::load_default() {
OrderedHashMap<String, List<Ref<InputEvent>>> builtins = get_builtins(); OrderedHashMap<String, List<Ref<InputEvent>>> builtins = get_builtins();
// List of Builtins which have an override for macOS. // 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()) { for (OrderedHashMap<String, List<Ref<InputEvent>>>::Element E = builtins.front(); E; E = E.next()) {
if (String(E.key()).ends_with(".macos")) { if (String(E.key()).ends_with(".macos")) {
// Strip .macos from name: some_input_name.macos -> some_input_name // 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] : ""; String override_for = fullname.split(".").size() > 1 ? fullname.split(".")[1] : "";
#ifdef APPLE_STYLE_KEYS #ifdef APPLE_STYLE_KEYS
if (osx_builtins.has(name) && override_for != "osx") { if (macos_builtins.has(name) && override_for != "macos") {
// Name has `osx` builtin but this particular one is for non-macOS systems - so skip. // Name has `macos` builtin but this particular one is for non-macOS systems - so skip.
continue; continue;
} }
#else #else
if (override_for == "osx") { if (override_for == "macos") {
// Override for macOS - not needed on non-macOS platforms. // Override for macOS - not needed on non-macOS platforms.
continue; continue;
} }