feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -190,7 +190,7 @@ void TabContainer::_notification(int p_what) {
|
|||
} break;
|
||||
|
||||
case NOTIFICATION_VISIBILITY_CHANGED: {
|
||||
if (!is_visible() || setup_current_tab > -2) {
|
||||
if (!is_visible()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -200,7 +200,7 @@ void TabContainer::_notification(int p_what) {
|
|||
// beat it to the punch and make sure that the correct node is the only one visible first.
|
||||
// Otherwise, it can prevent a tab change done right before this container was made visible.
|
||||
Vector<Control *> controls = _get_tab_controls();
|
||||
int current = get_current_tab();
|
||||
int current = setup_current_tab > -2 ? setup_current_tab : get_current_tab();
|
||||
for (int i = 0; i < controls.size(); i++) {
|
||||
controls[i]->set_visible(i == current);
|
||||
}
|
||||
|
|
@ -267,10 +267,14 @@ void TabContainer::_repaint() {
|
|||
Vector<Control *> controls = _get_tab_controls();
|
||||
int current = get_current_tab();
|
||||
|
||||
// Move the TabBar to the top or bottom.
|
||||
// Don't change the left and right offsets since the TabBar will resize and may change tab offset.
|
||||
if (tabs_position == POSITION_BOTTOM) {
|
||||
tab_bar->set_anchors_and_offsets_preset(PRESET_BOTTOM_WIDE);
|
||||
tab_bar->set_anchor_and_offset(SIDE_BOTTOM, 1.0, 0.0);
|
||||
tab_bar->set_anchor_and_offset(SIDE_TOP, 1.0, -_get_tab_height());
|
||||
} else {
|
||||
tab_bar->set_anchors_and_offsets_preset(PRESET_TOP_WIDE);
|
||||
tab_bar->set_anchor_and_offset(SIDE_BOTTOM, 0.0, _get_tab_height());
|
||||
tab_bar->set_anchor_and_offset(SIDE_TOP, 0.0, 0.0);
|
||||
}
|
||||
|
||||
updating_visibility = true;
|
||||
|
|
@ -299,7 +303,6 @@ void TabContainer::_repaint() {
|
|||
}
|
||||
updating_visibility = false;
|
||||
|
||||
_update_margins();
|
||||
update_minimum_size();
|
||||
}
|
||||
|
||||
|
|
@ -362,7 +365,7 @@ void TabContainer::_on_mouse_exited() {
|
|||
Vector<Control *> TabContainer::_get_tab_controls() const {
|
||||
Vector<Control *> controls;
|
||||
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)) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -539,7 +542,7 @@ void TabContainer::add_child_notify(Node *p_child) {
|
|||
return;
|
||||
}
|
||||
|
||||
Control *c = as_sortable_control(p_child, SortableVisbilityMode::IGNORE);
|
||||
Control *c = as_sortable_control(p_child, SortableVisibilityMode::IGNORE);
|
||||
if (!c) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -569,7 +572,7 @@ void TabContainer::move_child_notify(Node *p_child) {
|
|||
return;
|
||||
}
|
||||
|
||||
Control *c = as_sortable_control(p_child, SortableVisbilityMode::IGNORE);
|
||||
Control *c = as_sortable_control(p_child, SortableVisibilityMode::IGNORE);
|
||||
if (c) {
|
||||
tab_bar->move_tab(c->get_meta("_tab_index"), get_tab_idx_from_control(c));
|
||||
}
|
||||
|
|
@ -584,7 +587,7 @@ void TabContainer::remove_child_notify(Node *p_child) {
|
|||
return;
|
||||
}
|
||||
|
||||
Control *c = as_sortable_control(p_child, SortableVisbilityMode::IGNORE);
|
||||
Control *c = as_sortable_control(p_child, SortableVisibilityMode::IGNORE);
|
||||
if (!c) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -758,6 +761,7 @@ void TabContainer::set_all_tabs_in_front(bool p_in_front) {
|
|||
|
||||
remove_child(tab_bar);
|
||||
add_child(tab_bar, false, all_tabs_in_front ? INTERNAL_MODE_FRONT : INTERNAL_MODE_BACK);
|
||||
tab_bar->force_parent_owned();
|
||||
}
|
||||
|
||||
bool TabContainer::is_all_tabs_in_front() const {
|
||||
|
|
@ -909,7 +913,7 @@ Size2 TabContainer::get_minimum_size() const {
|
|||
for (int i = 0; i < controls.size(); i++) {
|
||||
Control *c = controls[i];
|
||||
|
||||
if (!c->is_visible_in_tree() && !use_hidden_tabs_for_min_size) {
|
||||
if (!c->is_visible() && !use_hidden_tabs_for_min_size) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue