Browse Source

Merge pull request #54004 from bruvzg/fix_multi_phy_key_map_3

Rémi Verschelde 3 years ago
parent
commit
485d9c3054
1 changed files with 7 additions and 2 deletions
  1. 7 2
      core/os/input_event.cpp

+ 7 - 2
core/os/input_event.cpp

@@ -329,8 +329,13 @@ bool InputEventKey::shortcut_match(const Ref<InputEvent> &p_event, bool p_exact_
 		return false;
 	}
 
-	return scancode == key->scancode &&
-		   (!p_exact_match || get_modifiers_mask() == key->get_modifiers_mask());
+	if (scancode == 0) {
+		return physical_scancode == key->physical_scancode &&
+			   (!p_exact_match || get_modifiers_mask() == key->get_modifiers_mask());
+	} else {
+		return scancode == key->scancode &&
+			   (!p_exact_match || get_modifiers_mask() == key->get_modifiers_mask());
+	}
 }
 
 void InputEventKey::_bind_methods() {