godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve null check in FindReplaceBar

Browse Source
This commit is contained in:
Yuri Sizov 2020-07-06 17:13:04 +03:00
parent b43fb407b1
commit e94b8a6acc
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/code_editor.cpp
View File

@ -108,8 +108,12 @@ void FindReplaceBar::_notification(int p_what) {
void FindReplaceBar::_unhandled_input(const Ref<InputEvent> &p_event) { void FindReplaceBar::_unhandled_input(const Ref<InputEvent> &p_event) {
Ref<InputEventKey> k = p_event; Ref<InputEventKey> k = p_event;
if (k.is_valid()) { if (!k.is_valid() || !k->is_pressed()) {
if (k->is_pressed() && (text_edit->has_focus() || vbc_lineedit->is_a_parent_of(get_focus_owner()))) { return;
}
Control *focus_owner = get_focus_owner();
if (text_edit->has_focus() || (focus_owner && vbc_lineedit->is_a_parent_of(focus_owner))) {
bool accepted = true; bool accepted = true;
switch (k->get_keycode()) { switch (k->get_keycode()) {
@ -126,7 +130,6 @@ void FindReplaceBar::_unhandled_input(const Ref<InputEvent> &p_event) {
} }
} }
} }
}
bool FindReplaceBar::_search(uint32_t p_flags, int p_from_line, int p_from_col) { bool FindReplaceBar::_search(uint32_t p_flags, int p_from_line, int p_from_col) {
int line, col; int line, col;