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

Add is_valid() check for InputEventKey in CanvasItemEditor.

Browse Source
This commit is contained in:
Eric M
2020-09-17 11:46:04 +10:00
parent efe5c250d5
commit 7941235e06
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -479,6 +479,7 @@ void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) {
return; return;
} }
if (k.is_valid()) {
if (k->get_keycode() == KEY_CONTROL || k->get_keycode() == KEY_ALT || k->get_keycode() == KEY_SHIFT) { if (k->get_keycode() == KEY_CONTROL || k->get_keycode() == KEY_ALT || k->get_keycode() == KEY_SHIFT) {
viewport->update(); viewport->update();
} }
@@ -498,6 +499,7 @@ void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) {
} }
} }
} }
}
Object *CanvasItemEditor::_get_editor_data(Object *p_what) { Object *CanvasItemEditor::_get_editor_data(Object *p_what) {
CanvasItem *ci = Object::cast_to<CanvasItem>(p_what); CanvasItem *ci = Object::cast_to<CanvasItem>(p_what);

2
scene/gui/menu_button.cpp
View File

@@ -123,7 +123,7 @@ MenuButton::MenuButton() {
set_toggle_mode(true); set_toggle_mode(true);
set_disable_shortcuts(false); set_disable_shortcuts(false);
set_process_unhandled_key_input(true); set_process_unhandled_key_input(true);
set_enabled_focus_mode(FOCUS_NONE); set_focus_mode(FOCUS_NONE);
set_action_mode(ACTION_MODE_BUTTON_PRESS); set_action_mode(ACTION_MODE_BUTTON_PRESS);
popup = memnew(PopupMenu); popup = memnew(PopupMenu);