mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 03:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42451 from Duroxxigar/rename-toplevel

Browse Source 
Renamed toplevel to be top_level
This commit is contained in:
Rémi Verschelde 2020-10-02 10:57:23 +02:00 committed by GitHub
commit 19f72beebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/CanvasItem.xml
View File

@ -607,7 +607,7 @@
<member name="show_behind_parent" type="bool" setter="set_draw_behind_parent" getter="is_draw_behind_parent_enabled" default="false">
If [code]true[/code], the object draws behind its parent.
</member>
<member name="toplevel" type="bool" setter="set_as_toplevel" getter="is_set_as_toplevel">
<member name="top_level" type="bool" setter="set_as_top_level" getter="is_set_as_top_level">
If [code]true[/code], the node will not inherit its transform from parent [CanvasItem]s.
</member>
<member name="show_on_top" type="bool" setter="_set_on_top" getter="_is_on_top">

2
doc/classes/Node3D.xml
View File

@ -301,7 +301,7 @@
<member name="scale" type="Vector3" setter="set_scale" getter="get_scale" default="Vector3( 1, 1, 1 )">
Scale part of the local transformation.
</member>
<member name="toplevel" type="bool" setter="set_as_toplevel" getter="is_set_as_toplevel">
<member name="top_level" type="bool" setter="set_as_top_level" getter="is_set_as_top_level">
If [code]true[/code], the node will not inherit its transformations from its parent. Node transformations are only in global space.
</member>
<member name="transform" type="Transform" setter="set_transform" getter="get_transform" default="Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )">

2
editor/animation_track_editor.cpp
View File

@ -5758,7 +5758,7 @@ AnimationTrackEditor::AnimationTrackEditor() {
box_selection = memnew(Control);
add_child(box_selection);
box_selection->set_as_toplevel(true);
box_selection->set_as_top_level(true);
box_selection->set_mouse_filter(MOUSE_FILTER_IGNORE);
box_selection->hide();
box_selection->connect("draw", callable_mp(this, &AnimationTrackEditor::_box_selection_draw));

2
editor/editor_audio_buses.cpp
View File

@ -846,7 +846,7 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
audioprev_hbc->add_child(audio_value_preview_label);
slider->add_child(audio_value_preview_box);
audio_value_preview_box->set_as_toplevel(true);
audio_value_preview_box->set_as_top_level(true);
Ref<StyleBoxFlat> panel_style = memnew(StyleBoxFlat);
panel_style->set_bg_color(Color(0.0f, 0.0f, 0.0f, 0.8f));
audio_value_preview_box->add_theme_style_override("panel", panel_style);

10
editor/editor_inspector.cpp
View File

@ -48,7 +48,7 @@ Size2 EditorProperty::get_minimum_size() const {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (!c->is_visible()) {
@ -117,7 +117,7 @@ void EditorProperty::_notification(int p_what) {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (c == bottom_editor) {
@ -179,7 +179,7 @@ void EditorProperty::_notification(int p_what) {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (c == bottom_editor) {
@ -1133,7 +1133,7 @@ void EditorInspectorSection::_notification(int p_what) {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (!c->is_visible_in_tree()) {
@ -1225,7 +1225,7 @@ Size2 EditorInspectorSection::get_minimum_size() const {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (!c->is_visible()) {

2
editor/editor_spin_slider.cpp
View File

@ -483,7 +483,7 @@ EditorSpinSlider::EditorSpinSlider() {
grabber = memnew(TextureRect);
add_child(grabber);
grabber->hide();
grabber->set_as_toplevel(true);
grabber->set_as_top_level(true);
grabber->set_mouse_filter(MOUSE_FILTER_STOP);
grabber->connect("mouse_entered", callable_mp(this, &EditorSpinSlider::_grabber_mouse_entered));
grabber->connect("mouse_exited", callable_mp(this, &EditorSpinSlider::_grabber_mouse_exited));

10
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -548,7 +548,7 @@ void CanvasItemEditor::_expand_encompassing_rect_using_children(Rect2 &r_rect, c
const CanvasItem *canvas_item = Object::cast_to<CanvasItem>(p_node);
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
if (canvas_item && !canvas_item->is_set_as_toplevel()) {
if (canvas_item && !canvas_item->is_set_as_top_level()) {
_expand_encompassing_rect_using_children(r_rect, p_node->get_child(i), r_first, p_parent_xform * canvas_item->get_transform(), p_canvas_xform);
} else {
const CanvasLayer *canvas_layer = Object::cast_to<CanvasLayer>(p_node);
@ -591,7 +591,7 @@ void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_no
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
if (canvas_item) {
if (!canvas_item->is_set_as_toplevel()) {
if (!canvas_item->is_set_as_top_level()) {
_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, p_parent_xform * canvas_item->get_transform(), p_canvas_xform);
} else {
_find_canvas_items_at_pos(p_pos, p_node->get_child(i), r_items, canvas_item->get_transform(), p_canvas_xform);
@ -767,7 +767,7 @@ void CanvasItemEditor::_find_canvas_items_in_rect(const Rect2 &p_rect, Node *p_n
if (!lock_children || !editable) {
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
if (canvas_item) {
if (!canvas_item->is_set_as_toplevel()) {
if (!canvas_item->is_set_as_top_level()) {
_find_canvas_items_in_rect(p_rect, p_node->get_child(i), r_items, p_parent_xform * canvas_item->get_transform(), p_canvas_xform);
} else {
_find_canvas_items_in_rect(p_rect, p_node->get_child(i), r_items, canvas_item->get_transform(), p_canvas_xform);
@ -3626,7 +3626,7 @@ void CanvasItemEditor::_draw_invisible_nodes_positions(Node *p_node, const Trans
Transform2D parent_xform = p_parent_xform;
Transform2D canvas_xform = p_canvas_xform;
if (canvas_item && !canvas_item->is_set_as_toplevel()) {
if (canvas_item && !canvas_item->is_set_as_top_level()) {
parent_xform = parent_xform * canvas_item->get_transform();
} else {
CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);
@ -3695,7 +3695,7 @@ void CanvasItemEditor::_draw_locks_and_groups(Node *p_node, const Transform2D &p
Transform2D parent_xform = p_parent_xform;
Transform2D canvas_xform = p_canvas_xform;
if (canvas_item && !canvas_item->is_set_as_toplevel()) {
if (canvas_item && !canvas_item->is_set_as_top_level()) {
parent_xform = parent_xform * canvas_item->get_transform();
} else {
CanvasLayer *cl = Object::cast_to<CanvasLayer>(p_node);

34
scene/3d/node_3d.cpp
View File

@ -103,7 +103,7 @@ void Node3D::_propagate_transform_changed(Node3D *p_origin) {
data.children_lock++;
for (List<Node3D *>::Element *E = data.children.front(); E; E = E->next()) {
if (E->get()->data.toplevel_active) {
if (E->get()->data.top_level_active) {
continue; //don't propagate to a toplevel
}
E->get()->_propagate_transform_changed(p_origin);
@ -136,12 +136,12 @@ void Node3D::_notification(int p_what) {
data.C = nullptr;
}
if (data.toplevel && !Engine::get_singleton()->is_editor_hint()) {
if (data.top_level && !Engine::get_singleton()->is_editor_hint()) {
if (data.parent) {
data.local_transform = data.parent->get_global_transform() * get_transform();
data.dirty = DIRTY_VECTORS; //global is always dirty upon entering a scene
}
data.toplevel_active = true;
data.top_level_active = true;
}
data.dirty |= DIRTY_GLOBAL; //global is always dirty upon entering a scene
@ -160,7 +160,7 @@ void Node3D::_notification(int p_what) {
}
data.parent = nullptr;
data.C = nullptr;
data.toplevel_active = false;
data.top_level_active = false;
} break;
case NOTIFICATION_ENTER_WORLD: {
data.inside_world = true;
@ -238,7 +238,7 @@ void Node3D::set_transform(const Transform &p_transform) {
void Node3D::set_global_transform(const Transform &p_transform) {
Transform xform =
(data.parent && !data.toplevel_active) ?
(data.parent && !data.top_level_active) ?
data.parent->get_global_transform().affine_inverse() * p_transform :
p_transform;
@ -261,7 +261,7 @@ Transform Node3D::get_global_transform() const {
_update_local_transform();
}
if (data.parent && !data.toplevel_active) {
if (data.parent && !data.top_level_active) {
data.global_transform = data.parent->get_global_transform() * data.local_transform;
} else {
data.global_transform = data.local_transform;
@ -462,8 +462,8 @@ bool Node3D::is_scale_disabled() const {
return data.disable_scale;
}
void Node3D::set_as_toplevel(bool p_enabled) {
if (data.toplevel == p_enabled) {
void Node3D::set_as_top_level(bool p_enabled) {
if (data.top_level == p_enabled) {
return;
}
if (is_inside_tree() && !Engine::get_singleton()->is_editor_hint()) {
@ -473,16 +473,16 @@ void Node3D::set_as_toplevel(bool p_enabled) {
set_transform(data.parent->get_global_transform().affine_inverse() * get_global_transform());
}
data.toplevel = p_enabled;
data.toplevel_active = p_enabled;
data.top_level = p_enabled;
data.top_level_active = p_enabled;
} else {
data.toplevel = p_enabled;
data.top_level = p_enabled;
}
}
bool Node3D::is_set_as_toplevel() const {
return data.toplevel;
bool Node3D::is_set_as_top_level() const {
return data.top_level;
}
Ref<World3D> Node3D::get_world_3d() const {
@ -715,8 +715,8 @@ void Node3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_global_transform"), &Node3D::get_global_transform);
ClassDB::bind_method(D_METHOD("get_parent_spatial"), &Node3D::get_parent_spatial);
ClassDB::bind_method(D_METHOD("set_ignore_transform_notification", "enabled"), &Node3D::set_ignore_transform_notification);
ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &Node3D::set_as_toplevel);
ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &Node3D::is_set_as_toplevel);
ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &Node3D::set_as_top_level);
ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &Node3D::is_set_as_top_level);
ClassDB::bind_method(D_METHOD("set_disable_scale", "disable"), &Node3D::set_disable_scale);
ClassDB::bind_method(D_METHOD("is_scale_disabled"), &Node3D::is_scale_disabled);
ClassDB::bind_method(D_METHOD("get_world_3d"), &Node3D::get_world_3d);
@ -789,8 +789,8 @@ Node3D::Node3D() :
data.children_lock = 0;
data.ignore_notification = false;
data.toplevel = false;
data.toplevel_active = false;
data.top_level = false;
data.top_level_active = false;
data.scale = Vector3(1, 1, 1);
data.viewport = nullptr;
data.inside_world = false;

8
scene/3d/node_3d.h
View File

@ -71,8 +71,8 @@ class Node3D : public Node {
Viewport *viewport;
bool toplevel_active;
bool toplevel;
bool top_level_active;
bool top_level;
bool inside_world;
int children_lock;
@ -144,8 +144,8 @@ public:
virtual Transform get_local_gizmo_transform() const;
#endif
void set_as_toplevel(bool p_enabled);
bool is_set_as_toplevel() const;
void set_as_top_level(bool p_enabled);
bool is_set_as_top_level() const;
void set_disable_scale(bool p_enabled);
bool is_scale_disabled() const;

4
scene/3d/physics_body_3d.cpp
View File

@ -2606,7 +2606,7 @@ void PhysicalBone3D::_start_physics_simulation() {
PhysicsServer3D::get_singleton()->body_set_collision_layer(get_rid(), get_collision_layer());
PhysicsServer3D::get_singleton()->body_set_collision_mask(get_rid(), get_collision_mask());
PhysicsServer3D::get_singleton()->body_set_force_integration_callback(get_rid(), this, "_direct_state_changed");
set_as_toplevel(true);
set_as_top_level(true);
_internal_simulate_physics = true;
}
@ -2626,7 +2626,7 @@ void PhysicalBone3D::_stop_physics_simulation() {
if (_internal_simulate_physics) {
PhysicsServer3D::get_singleton()->body_set_force_integration_callback(get_rid(), nullptr, "");
parent_skeleton->set_bone_global_pose_override(bone_id, Transform(), 0.0, false);
set_as_toplevel(false);
set_as_top_level(false);
_internal_simulate_physics = false;
}
}

2
scene/3d/soft_body_3d.cpp
View File

@ -282,7 +282,7 @@ void SoftBody3D::_notification(int p_what) {
set_notify_transform(false);
// Required to be top level with Transform at center of world in order to modify RenderingServer only to support custom Transform
set_as_toplevel(true);
set_as_top_level(true);
set_transform(Transform());
set_notify_transform(true);

8
scene/gui/box_container.cpp
View File

@ -57,7 +57,7 @@ void BoxContainer::_resort() {
if (!c || !c->is_visible_in_tree()) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
@ -111,7 +111,7 @@ void BoxContainer::_resort() {
if (!c || !c->is_visible_in_tree()) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
@ -172,7 +172,7 @@ void BoxContainer::_resort() {
if (!c || !c->is_visible_in_tree()) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
@ -224,7 +224,7 @@ Size2 BoxContainer::get_minimum_size() const {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}

4
scene/gui/center_container.cpp
View File

@ -40,7 +40,7 @@ Size2 CenterContainer::get_minimum_size() const {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (!c->is_visible()) {
@ -77,7 +77,7 @@ void CenterContainer::_notification(int p_what) {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}

2
scene/gui/color_picker.cpp
View File

@ -610,7 +610,7 @@ void ColorPicker::_screen_pick_pressed() {
if (!screen) {
screen = memnew(Control);
r->add_child(screen);
screen->set_as_toplevel(true);
screen->set_as_top_level(true);
screen->set_anchors_and_margins_preset(Control::PRESET_WIDE);
screen->set_default_cursor_shape(CURSOR_POINTING_HAND);
screen->connect("gui_input", callable_mp(this, &ColorPicker::_screen_input));

22
scene/gui/control.cpp
View File

@ -493,7 +493,7 @@ void Control::_notification(int p_notification) {
}
CanvasItem *ci = Object::cast_to<CanvasItem>(parent);
if (ci && ci->is_set_as_toplevel()) {
if (ci && ci->is_set_as_top_level()) {
subwindow = true;
break;
}
@ -532,7 +532,7 @@ void Control::_notification(int p_notification) {
if (data.parent_canvas_item) {
data.parent_canvas_item->disconnect("item_rect_changed", callable_mp(this, &Control::_size_changed));
data.parent_canvas_item = nullptr;
} else if (!is_set_as_toplevel()) {
} else if (!is_set_as_top_level()) {
//disconnect viewport
get_viewport()->disconnect("size_changed", callable_mp(this, &Control::_size_changed));
}
@ -1816,7 +1816,7 @@ void Control::set_focus_mode(FocusMode p_focus_mode) {
}
static Control *_next_control(Control *p_from) {
if (p_from->is_set_as_toplevel()) {
if (p_from->is_set_as_top_level()) {
return nullptr; // can't go above
}
@ -1830,7 +1830,7 @@ static Control *_next_control(Control *p_from) {
ERR_FAIL_INDEX_V(next, parent->get_child_count(), nullptr);
for (int i = (next + 1); i < parent->get_child_count(); i++) {
Control *c = Object::cast_to<Control>(parent->get_child(i));
if (!c || !c->is_visible_in_tree() || c->is_set_as_toplevel()) {
if (!c || !c->is_visible_in_tree() || c->is_set_as_top_level()) {
continue;
}
@ -1867,7 +1867,7 @@ Control *Control::find_next_valid_focus() const {
for (int i = 0; i < from->get_child_count(); i++) {
Control *c = Object::cast_to<Control>(from->get_child(i));
if (!c || !c->is_visible_in_tree() || c->is_set_as_toplevel()) {
if (!c || !c->is_visible_in_tree() || c->is_set_as_top_level()) {
continue;
}
@ -1879,7 +1879,7 @@ Control *Control::find_next_valid_focus() const {
next_child = _next_control(from);
if (!next_child) { //nothing else.. go up and find either window or subwindow
next_child = const_cast<Control *>(this);
while (next_child && !next_child->is_set_as_toplevel()) {
while (next_child && !next_child->is_set_as_top_level()) {
next_child = cast_to<Control>(next_child->get_parent());
}
@ -1915,7 +1915,7 @@ static Control *_prev_control(Control *p_from) {
Control *child = nullptr;
for (int i = p_from->get_child_count() - 1; i >= 0; i--) {
Control *c = Object::cast_to<Control>(p_from->get_child(i));
if (!c || !c->is_visible_in_tree() || c->is_set_as_toplevel()) {
if (!c || !c->is_visible_in_tree() || c->is_set_as_top_level()) {
continue;
}
@ -1955,7 +1955,7 @@ Control *Control::find_prev_valid_focus() const {
Control *prev_child = nullptr;
if (from->is_set_as_toplevel() || !Object::cast_to<Control>(from->get_parent())) {
if (from->is_set_as_top_level() || !Object::cast_to<Control>(from->get_parent())) {
//find last of the children
prev_child = _prev_control(from);
@ -1964,7 +1964,7 @@ Control *Control::find_prev_valid_focus() const {
for (int i = (from->get_index() - 1); i >= 0; i--) {
Control *c = Object::cast_to<Control>(from->get_parent()->get_child(i));
if (!c || !c->is_visible_in_tree() || c->is_set_as_toplevel()) {
if (!c || !c->is_visible_in_tree() || c->is_set_as_top_level()) {
continue;
}
@ -2024,7 +2024,7 @@ void Control::release_focus() {
}
bool Control::is_toplevel_control() const {
return is_inside_tree() && (!data.parent_canvas_item && !data.RI && is_set_as_toplevel());
return is_inside_tree() && (!data.parent_canvas_item && !data.RI && is_set_as_top_level());
}
void Control::_propagate_theme_changed(Node *p_at, Control *p_owner, Window *p_owner_window, bool p_assign) {
@ -2374,7 +2374,7 @@ void Control::minimum_size_changed() {
//invalidate cache upwards
while (invalidate && invalidate->data.minimum_size_valid) {
invalidate->data.minimum_size_valid = false;
if (invalidate->is_set_as_toplevel()) {
if (invalidate->is_set_as_top_level()) {
break; // do not go further up
}
if (!invalidate->data.parent && get_parent()) {

4
scene/gui/dialogs.cpp
View File

@ -181,7 +181,7 @@ void AcceptDialog::_update_child_rects() {
continue;
}
if (c == hbc || c == label || c == bg || c->is_set_as_toplevel()) {
if (c == hbc || c == label || c == bg || c->is_set_as_top_level()) {
continue;
}
@ -209,7 +209,7 @@ Size2 AcceptDialog::_get_contents_minimum_size() const {
continue;
}
if (c == hbc || c == label || c->is_set_as_toplevel()) {
if (c == hbc || c == label || c->is_set_as_top_level()) {
continue;
}

2
scene/gui/graph_edit.cpp
View File

@ -547,7 +547,7 @@ void GraphEdit::_top_layer_input(const Ref<InputEvent> &p_ev) {
}
bool GraphEdit::_check_clickable_control(Control *p_control, const Vector2 &pos) {
if (p_control->is_set_as_toplevel() || !p_control->is_visible()) {
if (p_control->is_set_as_top_level() || !p_control->is_visible()) {
return false;
}

10
scene/gui/graph_node.cpp
View File

@ -102,7 +102,7 @@ void GraphNode::_get_property_list(List<PropertyInfo> *p_list) const {
int idx = 0;
for (int i = 0; i < get_child_count(); i++) {
Control *c = Object::cast_to<Control>(get_child(i));
if (!c || c->is_set_as_toplevel()) {
if (!c || c->is_set_as_top_level()) {
continue;
}
@ -131,7 +131,7 @@ void GraphNode::_resort() {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
@ -156,7 +156,7 @@ void GraphNode::_resort() {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
@ -388,7 +388,7 @@ Size2 GraphNode::get_minimum_size() const {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
@ -477,7 +477,7 @@ void GraphNode::_connpos_update() {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}

4
scene/gui/margin_container.cpp
View File

@ -43,7 +43,7 @@ Size2 MarginContainer::get_minimum_size() const {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (!c->is_visible()) {
@ -80,7 +80,7 @@ void MarginContainer::_notification(int p_what) {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}

4
scene/gui/panel_container.cpp
View File

@ -45,7 +45,7 @@ Size2 PanelContainer::get_minimum_size() const {
if (!c || !c->is_visible()) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
@ -95,7 +95,7 @@ void PanelContainer::_notification(int p_what) {
if (!c || !c->is_visible_in_tree()) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}

4
scene/gui/popup.cpp
View File

@ -191,7 +191,7 @@ Size2 PopupPanel::_get_contents_minimum_size() const {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
@ -215,7 +215,7 @@ void PopupPanel::_update_child_rects() {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}

6
scene/gui/scroll_container.cpp
View File

@ -45,7 +45,7 @@ Size2 ScrollContainer::get_minimum_size() const {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (c == h_scroll || c == v_scroll) {
@ -285,7 +285,7 @@ void ScrollContainer::_notification(int p_what) {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (c == h_scroll || c == v_scroll) {
@ -529,7 +529,7 @@ String ScrollContainer::get_configuration_warning() const {
if (!c) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}
if (c == h_scroll || c == v_scroll) {

2
scene/gui/split_container.cpp
View File

@ -41,7 +41,7 @@ Control *SplitContainer::_getch(int p_idx) const {
if (!c || !c->is_visible_in_tree()) {
continue;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
continue;
}

4
scene/gui/tab_container.cpp
View File

@ -478,7 +478,7 @@ void TabContainer::_on_mouse_exited() {
int TabContainer::_get_tab_width(int p_index) const {
ERR_FAIL_INDEX_V(p_index, get_tab_count(), 0);
Control *control = Object::cast_to<Control>(_get_tabs()[p_index]);
if (!control || control->is_set_as_toplevel() || get_tab_hidden(p_index)) {
if (!control || control->is_set_as_top_level() || get_tab_hidden(p_index)) {
return 0;
}
@ -537,7 +537,7 @@ void TabContainer::add_child_notify(Node *p_child) {
if (!c) {
return;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
return;
}

36
scene/main/canvas_item.cpp
View File

@ -499,7 +499,7 @@ void CanvasItem::_toplevel_raise_self() {
}
void CanvasItem::_enter_canvas() {
if ((!Object::cast_to<CanvasItem>(get_parent())) || toplevel) {
if ((!Object::cast_to<CanvasItem>(get_parent())) || top_level) {
Node *n = this;
canvas_layer = nullptr;
@ -674,27 +674,27 @@ Color CanvasItem::get_modulate() const {
return modulate;
}
void CanvasItem::set_as_toplevel(bool p_toplevel) {
if (toplevel == p_toplevel) {
void CanvasItem::set_as_top_level(bool p_toplevel) {
if (top_level == p_toplevel) {
return;
}
if (!is_inside_tree()) {
toplevel = p_toplevel;
top_level = p_toplevel;
return;
}
_exit_canvas();
toplevel = p_toplevel;
top_level = p_toplevel;
_enter_canvas();
}
bool CanvasItem::is_set_as_toplevel() const {
return toplevel;
bool CanvasItem::is_set_as_top_level() const {
return top_level;
}
CanvasItem *CanvasItem::get_parent_item() const {
if (toplevel) {
if (top_level) {
return nullptr;
}
@ -967,7 +967,7 @@ void CanvasItem::_notify_transform(CanvasItem *p_node) {
for (List<CanvasItem *>::Element *E = p_node->children_items.front(); E; E = E->next()) {
CanvasItem *ci = E->get();
if (ci->toplevel) {
if (ci->top_level) {
continue;
}
_notify_transform(ci);
@ -997,9 +997,9 @@ ObjectID CanvasItem::get_canvas_layer_instance_id() const {
}
}
CanvasItem *CanvasItem::get_toplevel() const {
CanvasItem *CanvasItem::get_top_level() const {
CanvasItem *ci = const_cast<CanvasItem *>(this);
while (!ci->toplevel && Object::cast_to<CanvasItem>(ci->get_parent())) {
while (!ci->top_level && Object::cast_to<CanvasItem>(ci->get_parent())) {
ci = Object::cast_to<CanvasItem>(ci->get_parent());
}
@ -1009,7 +1009,7 @@ CanvasItem *CanvasItem::get_toplevel() const {
Ref<World2D> CanvasItem::get_world_2d() const {
ERR_FAIL_COND_V(!is_inside_tree(), Ref<World2D>());
CanvasItem *tl = get_toplevel();
CanvasItem *tl = get_top_level();
if (tl->get_viewport()) {
return tl->get_viewport()->find_world_2d();
@ -1136,8 +1136,8 @@ void CanvasItem::_bind_methods() {
ClassDB::bind_method(D_METHOD("update"), &CanvasItem::update);
ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &CanvasItem::set_as_toplevel);
ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &CanvasItem::is_set_as_toplevel);
ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &CanvasItem::set_as_top_level);
ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &CanvasItem::is_set_as_top_level);
ClassDB::bind_method(D_METHOD("set_light_mask", "light_mask"), &CanvasItem::set_light_mask);
ClassDB::bind_method(D_METHOD("get_light_mask"), &CanvasItem::get_light_mask);
@ -1218,7 +1218,7 @@ void CanvasItem::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "modulate"), "set_modulate", "get_modulate");
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "self_modulate"), "set_self_modulate", "get_self_modulate");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_behind_parent"), "set_draw_behind_parent", "is_draw_behind_parent_enabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toplevel"), "set_as_toplevel", "is_set_as_toplevel");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "top_level"), "set_as_top_level", "is_set_as_top_level");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "show_on_top", PROPERTY_HINT_NONE, "", 0), "_set_on_top", "_is_on_top"); //compatibility
ADD_PROPERTY(PropertyInfo(Variant::INT, "light_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_light_mask", "get_light_mask");
@ -1354,7 +1354,7 @@ void CanvasItem::_update_texture_filter_changed(bool p_propagate) {
if (p_propagate) {
for (List<CanvasItem *>::Element *E = children_items.front(); E; E = E->next()) {
if (!E->get()->toplevel && E->get()->texture_filter == TEXTURE_FILTER_PARENT_NODE) {
if (!E->get()->top_level && E->get()->texture_filter == TEXTURE_FILTER_PARENT_NODE) {
E->get()->_update_texture_filter_changed(true);
}
}
@ -1407,7 +1407,7 @@ void CanvasItem::_update_texture_repeat_changed(bool p_propagate) {
update();
if (p_propagate) {
for (List<CanvasItem *>::Element *E = children_items.front(); E; E = E->next()) {
if (!E->get()->toplevel && E->get()->texture_repeat == TEXTURE_REPEAT_PARENT_NODE) {
if (!E->get()->top_level && E->get()->texture_repeat == TEXTURE_REPEAT_PARENT_NODE) {
E->get()->_update_texture_repeat_changed(true);
}
}
@ -1436,7 +1436,7 @@ CanvasItem::CanvasItem() :
pending_update = false;
modulate = Color(1, 1, 1, 1);
self_modulate = Color(1, 1, 1, 1);
toplevel = false;
top_level = false;
first_draw = false;
drawing = false;
behind = false;

8
scene/main/canvas_item.h
View File

@ -201,7 +201,7 @@ private:
bool first_draw;
bool visible;
bool pending_update;
bool toplevel;
bool top_level;
bool drawing;
bool block_transform_notify;
bool behind;
@ -355,8 +355,8 @@ public:
/* RECT / TRANSFORM */
void set_as_toplevel(bool p_toplevel);
bool is_set_as_toplevel() const;
void set_as_top_level(bool p_toplevel);
bool is_set_as_top_level() const;
void set_draw_behind_parent(bool p_enable);
bool is_draw_behind_parent_enabled() const;
@ -369,7 +369,7 @@ public:
virtual Transform2D get_global_transform_with_canvas() const;
virtual Transform2D get_screen_transform() const;
CanvasItem *get_toplevel() const;
CanvasItem *get_top_level() const;
_FORCE_INLINE_ RID get_canvas_item() const {
return canvas_item;
}

22
scene/main/viewport.cpp
View File

@ -1493,7 +1493,7 @@ String Viewport::_gui_get_tooltip(Control *p_control, const Vector2 &p_pos, Cont
if (p_control->data.mouse_filter == Control::MOUSE_FILTER_STOP) {
break;
}
if (p_control->is_set_as_toplevel()) {
if (p_control->is_set_as_top_level()) {
break;
}
@ -1620,7 +1620,7 @@ void Viewport::_gui_call_input(Control *p_control, const Ref<InputEvent> &p_inpu
}
}
if (!control->is_inside_tree() || control->is_set_as_toplevel()) {
if (!control->is_inside_tree() || control->is_set_as_top_level()) {
break;
}
if (gui.key_event_accepted) {
@ -1631,7 +1631,7 @@ void Viewport::_gui_call_input(Control *p_control, const Ref<InputEvent> &p_inpu
}
}
if (ci->is_set_as_toplevel()) {
if (ci->is_set_as_top_level()) {
break;
}
@ -1655,7 +1655,7 @@ void Viewport::_gui_call_notification(Control *p_control, int p_what) {
break;
}
if (!control->is_inside_tree() || control->is_set_as_toplevel()) {
if (!control->is_inside_tree() || control->is_set_as_top_level()) {
break;
}
if (control->data.mouse_filter == Control::MOUSE_FILTER_STOP) {
@ -1663,7 +1663,7 @@ void Viewport::_gui_call_notification(Control *p_control, int p_what) {
}
}
if (ci->is_set_as_toplevel()) {
if (ci->is_set_as_top_level()) {
break;
}
@ -1721,7 +1721,7 @@ Control *Viewport::_gui_find_control_at_pos(CanvasItem *p_node, const Point2 &p_
if (!c || !c->clips_input() || c->has_point(matrix.affine_inverse().xform(p_global))) {
for (int i = p_node->get_child_count() - 1; i >= 0; i--) {
CanvasItem *ci = Object::cast_to<CanvasItem>(p_node->get_child(i));
if (!ci || ci->is_set_as_toplevel()) {
if (!ci || ci->is_set_as_top_level()) {
continue;
}
@ -1768,7 +1768,7 @@ bool Viewport::_gui_drop(Control *p_at_control, Point2 p_at_pos, bool p_just_che
p_at_pos = ci->get_transform().xform(p_at_pos);
if (ci->is_set_as_toplevel()) {
if (ci->is_set_as_top_level()) {
break;
}
@ -1865,7 +1865,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
}
}
if (ci->is_set_as_toplevel()) {
if (ci->is_set_as_top_level()) {
break;
}
@ -1993,7 +1993,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
}
}
if (ci->is_set_as_toplevel()) {
if (ci->is_set_as_top_level()) {
break;
}
@ -2105,7 +2105,7 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) {
if (c->data.mouse_filter == Control::MOUSE_FILTER_STOP) {
break;
}
if (c->is_set_as_toplevel()) {
if (c->is_set_as_top_level()) {
break;
}
c = c->get_parent_control();
@ -2404,7 +2404,7 @@ void Viewport::_gui_set_drag_preview(Control *p_base, Control *p_control) {
if (gui.drag_preview) {
memdelete(gui.drag_preview);
}
p_control->set_as_toplevel(true);
p_control->set_as_top_level(true);
p_control->set_position(gui.last_mouse_pos);
p_base->get_root_parent_control()->add_child(p_control); //add as child of viewport
p_control->raise();