asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix find_next_valid_focus() freeze

Browse source 
(cherry picked from commit d9ede52ded)
This commit is contained in:
kobewi 2022-06-30 16:22:40 +02:00 committed by Rémi Verschelde
parent 9e165a8c2b
commit f659869a45
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/gui/control.cpp
View file

@ -1825,7 +1825,7 @@ void Control::set_focus_mode(FocusMode p_focus_mode) {
static Control *_next_control(Control *p_from) { static Control *_next_control(Control *p_from) {
if (p_from->is_set_as_toplevel()) { if (p_from->is_set_as_toplevel()) {
return nullptr; // can't go above return nullptr; // Can't go above.
} }
Control *parent = Object::cast_to<Control>(p_from->get_parent()); Control *parent = Object::cast_to<Control>(p_from->get_parent());
@ -1845,7 +1845,7 @@ static Control *_next_control(Control *p_from) {
return c; return c;
} }
//no next in parent, try the same in parent // No next in parent, try the same in parent.
return _next_control(parent); return _next_control(parent);
} }
@ -1869,7 +1869,7 @@ Control *Control::find_next_valid_focus() const {
} }
} }
// find next child // Find next child.
Control *next_child = nullptr; Control *next_child = nullptr;
@ -1885,7 +1885,7 @@ Control *Control::find_next_valid_focus() const {
if (!next_child) { if (!next_child) {
next_child = _next_control(from); next_child = _next_control(from);
if (!next_child) { //nothing else.. go up and find either window or subwindow if (!next_child) { // Nothing else. Go up and find either window or subwindow.
next_child = const_cast<Control *>(this); next_child = const_cast<Control *>(this);
while (next_child && !next_child->is_set_as_toplevel()) { while (next_child && !next_child->is_set_as_toplevel()) {
next_child = cast_to<Control>(next_child->get_parent()); next_child = cast_to<Control>(next_child->get_parent());
@ -1903,7 +1903,7 @@ Control *Control::find_next_valid_focus() const {
} }
} }
if (next_child == this) { // no next control-> if (next_child == from) { // No next control.
return (get_focus_mode() == FOCUS_ALL) ? next_child : nullptr; return (get_focus_mode() == FOCUS_ALL) ? next_child : nullptr;
} }
if (next_child) { if (next_child) {
@ -1935,7 +1935,7 @@ static Control *_prev_control(Control *p_from) {
return p_from; return p_from;
} }
//no prev in parent, try the same in parent // No prev in parent, try the same in parent.
return _prev_control(child); return _prev_control(child);
} }
@ -1959,12 +1959,12 @@ Control *Control::find_prev_valid_focus() const {
} }
} }
// find prev child // Find prev child.
Control *prev_child = nullptr; Control *prev_child = nullptr;
if (from->is_set_as_toplevel() || !Object::cast_to<Control>(from->get_parent())) { if (from->is_set_as_toplevel() || !Object::cast_to<Control>(from->get_parent())) {
//find last of the children // Find last of the children.
prev_child = _prev_control(from); prev_child = _prev_control(from);
@ -1987,7 +1987,7 @@ Control *Control::find_prev_valid_focus() const {
} }
} }
if (prev_child == this) { // no prev control-> if (prev_child == from) { // No prev control.
return (get_focus_mode() == FOCUS_ALL) ? prev_child : nullptr; return (get_focus_mode() == FOCUS_ALL) ? prev_child : nullptr;
} }