asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #88494 from AThousandShips/tab_fix

Browse source 
Fix error spam when adding tabs to `TabBar` without deselect
This commit is contained in:
Rémi Verschelde 2024-02-22 11:23:15 +01:00
commit 0a3f162f17
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/gui/tab_bar.cpp
View file

@ -627,6 +627,10 @@ 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);
// Fix range if unable to deselect.
if (current == -1 && !_can_deselect()) {
current = 0;
}
_update_cache();
_ensure_no_over_offset();
@ -1557,10 +1561,7 @@ bool TabBar::_can_deselect() const {
}
void TabBar::ensure_tab_visible(int p_idx) {
if (!is_inside_tree() || !buttons_visible) {
return;
}
if (p_idx == -1 && _can_deselect()) {
if (p_idx == -1 || !is_inside_tree() || !buttons_visible) {
return;
}
ERR_FAIL_INDEX(p_idx, tabs.size());