Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-18 08:41:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #58089 from YeldhamDev/crashy_tabs

Browse Source
This commit is contained in:
Rémi Verschelde 2022-02-14 15:21:18 +01:00 committed by GitHub
commit af98de8823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scene/gui/tab_bar.cpp
View File

@ -524,13 +524,14 @@ void TabBar::set_tab_count(int p_count) {
offset = MIN(offset, p_count - 1);
max_drawn_tab = MIN(max_drawn_tab, p_count - 1);
current = MIN(current, p_count - 1);
_update_cache();
_ensure_no_over_offset();
if (scroll_to_selected) {
ensure_tab_visible(current);
}
}
_update_cache();
_ensure_no_over_offset();
if (scroll_to_selected) {
ensure_tab_visible(current);
}
update();
update_minimum_size();
notify_property_list_changed();
@ -961,7 +962,6 @@ void TabBar::clear_tabs() {
current = 0;
previous = 0;
_update_cache();
update();
update_minimum_size();
notify_property_list_changed();
@ -975,18 +975,21 @@ void TabBar::remove_tab(int p_idx) {
}
if (current < 0) {
offset = 0;
max_drawn_tab = 0;
current = 0;
previous = 0;
}
if (current >= tabs.size()) {
current = tabs.size() - 1;
} else {
offset = MIN(offset, tabs.size() - 1);
max_drawn_tab = MIN(max_drawn_tab, tabs.size() - 1);
_update_cache();
_ensure_no_over_offset();
if (scroll_to_selected && !tabs.is_empty()) {
ensure_tab_visible(current);
}
}
_update_cache();
_ensure_no_over_offset();
if (scroll_to_selected && !tabs.is_empty()) {
ensure_tab_visible(current);
}
update();
update_minimum_size();
notify_property_list_changed();