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

Merge pull request #72613 from Sauermann/fix-toplevel-top-level

Browse Source 
Fix toplevel nomenclature
This commit is contained in:
Yuri Sizov 2023-02-02 20:49:20 +03:00 committed by GitHub
commit 18e827ee46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/control.cpp
View File

@ -692,7 +692,7 @@ Transform2D Control::get_transform() const {
return xform;
}
void Control::_toplevel_changed_on_parent() {
void Control::_top_level_changed_on_parent() {
// Update root control status.
_notification(NOTIFICATION_EXIT_CANVAS);
_notification(NOTIFICATION_ENTER_CANVAS);

4
scene/gui/control.h
View File

@ -292,8 +292,8 @@ private:
void _update_minimum_size();
void _size_changed();
void _toplevel_changed() override{}; // Controls don't need to do anything, only other CanvasItems.
void _toplevel_changed_on_parent() override;
void _top_level_changed() override {} // Controls don't need to do anything, only other CanvasItems.
void _top_level_changed_on_parent() override;
void _clear_size_warning();

16
scene/main/canvas_item.cpp
View File

@ -185,7 +185,7 @@ void CanvasItem::_top_level_raise_self() {
}
void CanvasItem::_enter_canvas() {
// Resolves to nullptr if the node is toplevel.
// Resolves to nullptr if the node is top_level.
CanvasItem *parent_item = get_parent_item();
if (parent_item) {
@ -400,26 +400,26 @@ void CanvasItem::set_as_top_level(bool p_top_level) {
_exit_canvas();
top_level = p_top_level;
_toplevel_changed();
_top_level_changed();
_enter_canvas();
_notify_transform();
}
void CanvasItem::_toplevel_changed() {
// Inform children that toplevel status has changed on a parent.
void CanvasItem::_top_level_changed() {
// Inform children that top_level status has changed on a parent.
int children = get_child_count();
for (int i = 0; i < children; i++) {
CanvasItem *child = Object::cast_to<CanvasItem>(get_child(i));
if (child) {
child->_toplevel_changed_on_parent();
child->_top_level_changed_on_parent();
}
}
}
void CanvasItem::_toplevel_changed_on_parent() {
// Inform children that toplevel status has changed on a parent.
_toplevel_changed();
void CanvasItem::_top_level_changed_on_parent() {
// Inform children that top_level status has changed on a parent.
_top_level_changed();
}
bool CanvasItem::is_set_as_top_level() const {

4
scene/main/canvas_item.h
View File

@ -125,8 +125,8 @@ private:
void _propagate_visibility_changed(bool p_parent_visible_in_tree);
void _handle_visibility_change(bool p_visible);
virtual void _toplevel_changed();
virtual void _toplevel_changed_on_parent();
virtual void _top_level_changed();
virtual void _top_level_changed_on_parent();
void _redraw_callback();