|
@@ -2012,14 +2012,15 @@ Control *Control::find_next_valid_focus() const {
|
|
|
|
|
|
if (!data.focus_next.is_empty()) {
|
|
|
Node *n = get_node(data.focus_next);
|
|
|
+ Control *c;
|
|
|
if (n) {
|
|
|
- from = Object::cast_to<Control>(n);
|
|
|
- ERR_FAIL_COND_V_MSG(!from, NULL, "Next focus node is not a control: " + n->get_name() + ".");
|
|
|
+ c = Object::cast_to<Control>(n);
|
|
|
+ ERR_FAIL_COND_V_MSG(!c, NULL, "Next focus node is not a control: " + n->get_name() + ".");
|
|
|
} else {
|
|
|
return NULL;
|
|
|
}
|
|
|
- if (from->is_visible() && from->get_focus_mode() != FOCUS_NONE)
|
|
|
- return from;
|
|
|
+ if (c->is_visible() && c->get_focus_mode() != FOCUS_NONE)
|
|
|
+ return c;
|
|
|
}
|
|
|
|
|
|
// find next child
|
|
@@ -2102,14 +2103,15 @@ Control *Control::find_prev_valid_focus() const {
|
|
|
|
|
|
if (!data.focus_prev.is_empty()) {
|
|
|
Node *n = get_node(data.focus_prev);
|
|
|
+ Control *c;
|
|
|
if (n) {
|
|
|
- from = Object::cast_to<Control>(n);
|
|
|
- ERR_FAIL_COND_V_MSG(!from, NULL, "Previous focus node is not a control: " + n->get_name() + ".");
|
|
|
+ c = Object::cast_to<Control>(n);
|
|
|
+ ERR_FAIL_COND_V_MSG(!c, NULL, "Previous focus node is not a control: " + n->get_name() + ".");
|
|
|
} else {
|
|
|
return NULL;
|
|
|
}
|
|
|
- if (from->is_visible() && from->get_focus_mode() != FOCUS_NONE)
|
|
|
- return from;
|
|
|
+ if (c->is_visible() && c->get_focus_mode() != FOCUS_NONE)
|
|
|
+ return c;
|
|
|
}
|
|
|
|
|
|
// find prev child
|