feat: updated godot version
This commit is contained in:
parent
0c508b0831
commit
42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
|
|
@ -30,10 +30,6 @@
|
|||
|
||||
#include "container.h"
|
||||
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "servers/display/accessibility_server.h"
|
||||
|
||||
void Container::_child_minsize_changed() {
|
||||
update_minimum_size();
|
||||
queue_sort();
|
||||
|
|
@ -94,7 +90,6 @@ void Container::_sort_children() {
|
|||
notification(NOTIFICATION_SORT_CHILDREN);
|
||||
emit_signal(SceneStringName(sort_children));
|
||||
pending_sort = false;
|
||||
layout_pending_finish();
|
||||
}
|
||||
|
||||
void Container::fit_child_in_rect(RequiredParam<Control> rp_child, const Rect2 &p_rect) {
|
||||
|
|
@ -141,7 +136,6 @@ void Container::queue_sort() {
|
|||
return;
|
||||
}
|
||||
|
||||
layout_pending_start();
|
||||
callable_mp(this, &Container::_sort_children).call_deferred();
|
||||
pending_sort = true;
|
||||
}
|
||||
|
|
@ -194,11 +188,7 @@ void Container::_notification(int p_what) {
|
|||
RID ae = get_accessibility_element();
|
||||
ERR_FAIL_COND(ae.is_null());
|
||||
|
||||
if (accessibility_region) {
|
||||
AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_REGION);
|
||||
} else {
|
||||
AccessibilityServer::get_singleton()->update_set_role(ae, AccessibilityServerEnums::AccessibilityRole::ROLE_CONTAINER);
|
||||
}
|
||||
DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_CONTAINER);
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_RESIZED:
|
||||
|
|
@ -214,18 +204,6 @@ void Container::_notification(int p_what) {
|
|||
}
|
||||
}
|
||||
|
||||
void Container::set_accessibility_region(bool p_region) {
|
||||
ERR_MAIN_THREAD_GUARD;
|
||||
if (accessibility_region != p_region) {
|
||||
accessibility_region = p_region;
|
||||
queue_accessibility_update();
|
||||
}
|
||||
}
|
||||
|
||||
bool Container::is_accessibility_region() const {
|
||||
return accessibility_region;
|
||||
}
|
||||
|
||||
PackedStringArray Container::get_configuration_warnings() const {
|
||||
PackedStringArray warnings = Control::get_configuration_warnings();
|
||||
|
||||
|
|
@ -239,8 +217,6 @@ PackedStringArray Container::get_configuration_warnings() const {
|
|||
void Container::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("queue_sort"), &Container::queue_sort);
|
||||
ClassDB::bind_method(D_METHOD("fit_child_in_rect", "child", "rect"), &Container::fit_child_in_rect);
|
||||
ClassDB::bind_method(D_METHOD("set_accessibility_region", "region"), &Container::set_accessibility_region);
|
||||
ClassDB::bind_method(D_METHOD("is_accessibility_region"), &Container::is_accessibility_region);
|
||||
|
||||
GDVIRTUAL_BIND(_get_allowed_size_flags_horizontal);
|
||||
GDVIRTUAL_BIND(_get_allowed_size_flags_vertical);
|
||||
|
|
@ -250,8 +226,6 @@ void Container::_bind_methods() {
|
|||
|
||||
ADD_SIGNAL(MethodInfo("pre_sort_children"));
|
||||
ADD_SIGNAL(MethodInfo("sort_children"));
|
||||
|
||||
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "accessibility_region"), "set_accessibility_region", "is_accessibility_region");
|
||||
}
|
||||
|
||||
Container::Container() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue