You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-23 15:16:17 +00:00
Merge pull request #101745 from Rindbee/remove-is_top_level_control
Remove confusing `Control::is_top_level_control()`
This commit is contained in:
@@ -624,11 +624,6 @@ bool Control::_property_get_revert(const StringName &p_name, Variant &r_property
|
|||||||
|
|
||||||
// Global relations.
|
// Global relations.
|
||||||
|
|
||||||
bool Control::is_top_level_control() const {
|
|
||||||
ERR_READ_THREAD_GUARD_V(false);
|
|
||||||
return is_inside_tree() && (!data.parent_canvas_item && !data.RI && is_set_as_top_level());
|
|
||||||
}
|
|
||||||
|
|
||||||
Control *Control::get_parent_control() const {
|
Control *Control::get_parent_control() const {
|
||||||
ERR_READ_THREAD_GUARD_V(nullptr);
|
ERR_READ_THREAD_GUARD_V(nullptr);
|
||||||
return data.parent_control;
|
return data.parent_control;
|
||||||
@@ -648,10 +643,6 @@ Control *Control::get_root_parent_control() const {
|
|||||||
const Control *c = Object::cast_to<Control>(ci);
|
const Control *c = Object::cast_to<Control>(ci);
|
||||||
if (c) {
|
if (c) {
|
||||||
root = c;
|
root = c;
|
||||||
|
|
||||||
if (c->data.RI || c->is_top_level_control()) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ci = ci->get_parent_item();
|
ci = ci->get_parent_item();
|
||||||
|
|||||||
@@ -454,8 +454,6 @@ public:
|
|||||||
|
|
||||||
// Global relations.
|
// Global relations.
|
||||||
|
|
||||||
bool is_top_level_control() const;
|
|
||||||
|
|
||||||
Control *get_parent_control() const;
|
Control *get_parent_control() const;
|
||||||
Window *get_parent_window() const;
|
Window *get_parent_window() const;
|
||||||
Control *get_root_parent_control() const;
|
Control *get_root_parent_control() const;
|
||||||
|
|||||||
Reference in New Issue
Block a user