You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-14 13:41:12 +00:00
Merge pull request #18020 from bruvzg/input_fix_non_latin_and_add_hw_scancodes
Fix non-latin layout scancodes on Linux, adds access to physical scancodes.
This commit is contained in:
@@ -1899,7 +1899,7 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) {
|
||||
// This is handled by the platform implementation on macOS,
|
||||
// so only define the shortcut on other platforms
|
||||
#ifndef OSX_ENABLED
|
||||
if (k->get_scancode_with_modifiers() == (KEY_MASK_CMD | KEY_Q)) {
|
||||
if (k->get_keycode_with_modifiers() == (KEY_MASK_CMD | KEY_Q)) {
|
||||
_dim_window();
|
||||
get_tree()->quit();
|
||||
}
|
||||
@@ -1908,9 +1908,9 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) {
|
||||
if (tabs->get_current_tab() != 0)
|
||||
return;
|
||||
|
||||
bool scancode_handled = true;
|
||||
bool keycode_handled = true;
|
||||
|
||||
switch (k->get_scancode()) {
|
||||
switch (k->get_keycode()) {
|
||||
|
||||
case KEY_ENTER: {
|
||||
|
||||
@@ -1967,14 +1967,14 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) {
|
||||
if (k->get_command())
|
||||
this->project_filter->search_box->grab_focus();
|
||||
else
|
||||
scancode_handled = false;
|
||||
keycode_handled = false;
|
||||
} break;
|
||||
default: {
|
||||
scancode_handled = false;
|
||||
keycode_handled = false;
|
||||
} break;
|
||||
}
|
||||
|
||||
if (scancode_handled) {
|
||||
if (keycode_handled) {
|
||||
accept_event();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user