|
@@ -499,7 +499,7 @@ void CanvasItem::_toplevel_raise_self() {
|
|
}
|
|
}
|
|
|
|
|
|
void CanvasItem::_enter_canvas() {
|
|
void CanvasItem::_enter_canvas() {
|
|
- if ((!Object::cast_to<CanvasItem>(get_parent())) || toplevel) {
|
|
|
|
|
|
+ if ((!Object::cast_to<CanvasItem>(get_parent())) || top_level) {
|
|
Node *n = this;
|
|
Node *n = this;
|
|
|
|
|
|
canvas_layer = nullptr;
|
|
canvas_layer = nullptr;
|
|
@@ -674,27 +674,27 @@ Color CanvasItem::get_modulate() const {
|
|
return modulate;
|
|
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;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
if (!is_inside_tree()) {
|
|
if (!is_inside_tree()) {
|
|
- toplevel = p_toplevel;
|
|
|
|
|
|
+ top_level = p_toplevel;
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
_exit_canvas();
|
|
_exit_canvas();
|
|
- toplevel = p_toplevel;
|
|
|
|
|
|
+ top_level = p_toplevel;
|
|
_enter_canvas();
|
|
_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 {
|
|
CanvasItem *CanvasItem::get_parent_item() const {
|
|
- if (toplevel) {
|
|
|
|
|
|
+ if (top_level) {
|
|
return nullptr;
|
|
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()) {
|
|
for (List<CanvasItem *>::Element *E = p_node->children_items.front(); E; E = E->next()) {
|
|
CanvasItem *ci = E->get();
|
|
CanvasItem *ci = E->get();
|
|
- if (ci->toplevel) {
|
|
|
|
|
|
+ if (ci->top_level) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
_notify_transform(ci);
|
|
_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);
|
|
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());
|
|
ci = Object::cast_to<CanvasItem>(ci->get_parent());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1009,7 +1009,7 @@ CanvasItem *CanvasItem::get_toplevel() const {
|
|
Ref<World2D> CanvasItem::get_world_2d() const {
|
|
Ref<World2D> CanvasItem::get_world_2d() const {
|
|
ERR_FAIL_COND_V(!is_inside_tree(), Ref<World2D>());
|
|
ERR_FAIL_COND_V(!is_inside_tree(), Ref<World2D>());
|
|
|
|
|
|
- CanvasItem *tl = get_toplevel();
|
|
|
|
|
|
+ CanvasItem *tl = get_top_level();
|
|
|
|
|
|
if (tl->get_viewport()) {
|
|
if (tl->get_viewport()) {
|
|
return tl->get_viewport()->find_world_2d();
|
|
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("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("set_light_mask", "light_mask"), &CanvasItem::set_light_mask);
|
|
ClassDB::bind_method(D_METHOD("get_light_mask"), &CanvasItem::get_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, "modulate"), "set_modulate", "get_modulate");
|
|
ADD_PROPERTY(PropertyInfo(Variant::COLOR, "self_modulate"), "set_self_modulate", "get_self_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, "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::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");
|
|
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) {
|
|
if (p_propagate) {
|
|
for (List<CanvasItem *>::Element *E = children_items.front(); E; E = E->next()) {
|
|
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);
|
|
E->get()->_update_texture_filter_changed(true);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1407,7 +1407,7 @@ void CanvasItem::_update_texture_repeat_changed(bool p_propagate) {
|
|
update();
|
|
update();
|
|
if (p_propagate) {
|
|
if (p_propagate) {
|
|
for (List<CanvasItem *>::Element *E = children_items.front(); E; E = E->next()) {
|
|
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);
|
|
E->get()->_update_texture_repeat_changed(true);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -1436,7 +1436,7 @@ CanvasItem::CanvasItem() :
|
|
pending_update = false;
|
|
pending_update = false;
|
|
modulate = Color(1, 1, 1, 1);
|
|
modulate = Color(1, 1, 1, 1);
|
|
self_modulate = Color(1, 1, 1, 1);
|
|
self_modulate = Color(1, 1, 1, 1);
|
|
- toplevel = false;
|
|
|
|
|
|
+ top_level = false;
|
|
first_draw = false;
|
|
first_draw = false;
|
|
drawing = false;
|
|
drawing = false;
|
|
behind = false;
|
|
behind = false;
|