godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Typo fix: rename SortableVisbilityMode

This commit is contained in:
Janis Kirsteins 2025-01-19 00:33:39 +01:00
parent 7b1ed520bd
commit 815e905972
15 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/aspect_ratio_container.cpp
View File

@ -35,7 +35,7 @@
Size2 AspectRatioContainer::get_minimum_size() const { Size2 AspectRatioContainer::get_minimum_size() const {
Size2 ms; Size2 ms;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE); Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
if (!c) { if (!c) {
continue; continue;
} }

2
scene/gui/box_container.cpp
View File

@ -243,7 +243,7 @@ Size2 BoxContainer::get_minimum_size() const {
bool first = true; bool first = true;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE); Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
if (!c) { if (!c) {
continue; continue;
} }

2
scene/gui/center_container.cpp
View File

@ -36,7 +36,7 @@ Size2 CenterContainer::get_minimum_size() const {
} }
Size2 ms; Size2 ms;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE); Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
if (!c) { if (!c) {
continue; continue;
} }

6
scene/gui/container.cpp
View File

@ -140,15 +140,15 @@ void Container::queue_sort() {
pending_sort = true; pending_sort = true;
} }
Control *Container::as_sortable_control(Node *p_node, SortableVisbilityMode p_visibility_mode) const { Control *Container::as_sortable_control(Node *p_node, SortableVisibilityMode p_visibility_mode) const {
Control *c = Object::cast_to<Control>(p_node); Control *c = Object::cast_to<Control>(p_node);
if (!c || c->is_set_as_top_level()) { if (!c || c->is_set_as_top_level()) {
return nullptr; return nullptr;
} }
if (p_visibility_mode == SortableVisbilityMode::VISIBLE && !c->is_visible()) { if (p_visibility_mode == SortableVisibilityMode::VISIBLE && !c->is_visible()) {
return nullptr; return nullptr;
} }
if (p_visibility_mode == SortableVisbilityMode::VISIBLE_IN_TREE && !c->is_visible_in_tree()) { if (p_visibility_mode == SortableVisibilityMode::VISIBLE_IN_TREE && !c->is_visible_in_tree()) {
return nullptr; return nullptr;
} }
return c; return c;

4
scene/gui/container.h
View File

@ -41,14 +41,14 @@ class Container : public Control {
void _child_minsize_changed(); void _child_minsize_changed();
protected: protected:
enum class SortableVisbilityMode { enum class SortableVisibilityMode {
VISIBLE, VISIBLE,
VISIBLE_IN_TREE, VISIBLE_IN_TREE,
IGNORE, IGNORE,
}; };
void queue_sort(); void queue_sort();
Control *as_sortable_control(Node *p_node, SortableVisbilityMode p_visibility_mode = SortableVisbilityMode::VISIBLE_IN_TREE) const; Control *as_sortable_control(Node *p_node, SortableVisibilityMode p_visibility_mode = SortableVisibilityMode::VISIBLE_IN_TREE) const;
virtual void add_child_notify(Node *p_child) override; virtual void add_child_notify(Node *p_child) override;
virtual void move_child_notify(Node *p_child) override; virtual void move_child_notify(Node *p_child) override;

2
scene/gui/flow_container.cpp
View File

@ -268,7 +268,7 @@ Size2 FlowContainer::get_minimum_size() const {
Size2i minimum; Size2i minimum;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE); Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
if (!c) { if (!c) {
continue; continue;
} }

2
scene/gui/graph_element.cpp
View File

@ -59,7 +59,7 @@ void GraphElement::_resort() {
Size2 GraphElement::get_minimum_size() const { Size2 GraphElement::get_minimum_size() const {
Size2 minsize; Size2 minsize;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *child = as_sortable_control(get_child(i), SortableVisbilityMode::IGNORE); Control *child = as_sortable_control(get_child(i), SortableVisibilityMode::IGNORE);
if (!child) { if (!child) {
continue; continue;
} }

4
scene/gui/graph_node.cpp
View File

@ -129,7 +129,7 @@ bool GraphNode::_get(const StringName &p_name, Variant &r_ret) const {
void GraphNode::_get_property_list(List<PropertyInfo> *p_list) const { void GraphNode::_get_property_list(List<PropertyInfo> *p_list) const {
int idx = 0; int idx = 0;
for (int i = 0; i < get_child_count(false); i++) { for (int i = 0; i < get_child_count(false); i++) {
Control *child = as_sortable_control(get_child(i, false), SortableVisbilityMode::IGNORE); Control *child = as_sortable_control(get_child(i, false), SortableVisibilityMode::IGNORE);
if (!child) { if (!child) {
continue; continue;
} }
@ -657,7 +657,7 @@ void GraphNode::_port_pos_update() {
int slot_index = 0; int slot_index = 0;
for (int i = 0; i < get_child_count(false); i++) { for (int i = 0; i < get_child_count(false); i++) {
Control *child = as_sortable_control(get_child(i, false), SortableVisbilityMode::IGNORE); Control *child = as_sortable_control(get_child(i, false), SortableVisibilityMode::IGNORE);
if (!child) { if (!child) {
continue; continue;
} }

2
scene/gui/grid_container.cpp
View File

@ -279,7 +279,7 @@ Size2 GridContainer::get_minimum_size() const {
int valid_controls_index = 0; int valid_controls_index = 0;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE); Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
if (!c) { if (!c) {
continue; continue;
} }

2
scene/gui/margin_container.cpp
View File

@ -36,7 +36,7 @@ Size2 MarginContainer::get_minimum_size() const {
Size2 max; Size2 max;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE); Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
if (!c) { if (!c) {
continue; continue;
} }

2
scene/gui/panel_container.cpp
View File

@ -35,7 +35,7 @@
Size2 PanelContainer::get_minimum_size() const { Size2 PanelContainer::get_minimum_size() const {
Size2 ms; Size2 ms;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE); Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
if (!c) { if (!c) {
continue; continue;
} }

4
scene/gui/scroll_container.cpp
View File

@ -40,7 +40,7 @@ Size2 ScrollContainer::get_minimum_size() const {
largest_child_min_size = Size2(); largest_child_min_size = Size2();
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE); Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
if (!c) { if (!c) {
continue; continue;
} }
@ -562,7 +562,7 @@ PackedStringArray ScrollContainer::get_configuration_warnings() const {
int found = 0; int found = 0;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *c = as_sortable_control(get_child(i), SortableVisbilityMode::VISIBLE); Control *c = as_sortable_control(get_child(i), SortableVisibilityMode::VISIBLE);
if (!c) { if (!c) {
continue; continue;
} }

4
scene/gui/split_container.cpp
View File

@ -124,7 +124,7 @@ void SplitContainerDragger::_notification(int p_what) {
} }
} }
Control *SplitContainer::_get_sortable_child(int p_idx, SortableVisbilityMode p_visibility_mode) const { Control *SplitContainer::_get_sortable_child(int p_idx, SortableVisibilityMode p_visibility_mode) const {
int idx = 0; int idx = 0;
for (int i = 0; i < get_child_count(false); i++) { for (int i = 0; i < get_child_count(false); i++) {
Control *c = as_sortable_control(get_child(i, false), p_visibility_mode); Control *c = as_sortable_control(get_child(i, false), p_visibility_mode);
@ -257,7 +257,7 @@ Size2 SplitContainer::get_minimum_size() const {
int sep = _get_separation(); int sep = _get_separation();
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
Control *child = _get_sortable_child(i, SortableVisbilityMode::VISIBLE); Control *child = _get_sortable_child(i, SortableVisibilityMode::VISIBLE);
if (!child) { if (!child) {
break; break;
} }

2
scene/gui/split_container.h
View File

@ -92,7 +92,7 @@ private:
void _compute_split_offset(bool p_clamp); void _compute_split_offset(bool p_clamp);
int _get_separation() const; int _get_separation() const;
void _resort(); void _resort();
Control *_get_sortable_child(int p_idx, SortableVisbilityMode p_visibility_mode = SortableVisbilityMode::VISIBLE_IN_TREE) const; Control *_get_sortable_child(int p_idx, SortableVisibilityMode p_visibility_mode = SortableVisibilityMode::VISIBLE_IN_TREE) const;
protected: protected:
bool is_fixed = false; bool is_fixed = false;

8
scene/gui/tab_container.cpp
View File

@ -365,7 +365,7 @@ void TabContainer::_on_mouse_exited() {
Vector<Control *> TabContainer::_get_tab_controls() const { Vector<Control *> TabContainer::_get_tab_controls() const {
Vector<Control *> controls; Vector<Control *> controls;
for (int i = 0; i < get_child_count(); i++) { for (int i = 0; i < get_child_count(); i++) {
Control *control = as_sortable_control(get_child(i), SortableVisbilityMode::IGNORE); Control *control = as_sortable_control(get_child(i), SortableVisibilityMode::IGNORE);
if (!control || control == tab_bar || children_removing.has(control)) { if (!control || control == tab_bar || children_removing.has(control)) {
continue; continue;
} }
@ -542,7 +542,7 @@ void TabContainer::add_child_notify(Node *p_child) {
return; return;
} }
Control *c = as_sortable_control(p_child, SortableVisbilityMode::IGNORE); Control *c = as_sortable_control(p_child, SortableVisibilityMode::IGNORE);
if (!c) { if (!c) {
return; return;
} }
@ -572,7 +572,7 @@ void TabContainer::move_child_notify(Node *p_child) {
return; return;
} }
Control *c = as_sortable_control(p_child, SortableVisbilityMode::IGNORE); Control *c = as_sortable_control(p_child, SortableVisibilityMode::IGNORE);
if (c) { if (c) {
tab_bar->move_tab(c->get_meta("_tab_index"), get_tab_idx_from_control(c)); tab_bar->move_tab(c->get_meta("_tab_index"), get_tab_idx_from_control(c));
} }
@ -587,7 +587,7 @@ void TabContainer::remove_child_notify(Node *p_child) {
return; return;
} }
Control *c = as_sortable_control(p_child, SortableVisbilityMode::IGNORE); Control *c = as_sortable_control(p_child, SortableVisibilityMode::IGNORE);
if (!c) { if (!c) {
return; return;
} }