godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix TabContainer's minimum size ignoring the popup button

Browse Source
This commit is contained in:
Michael Alexsander
2025-12-17 15:00:22 -03:00
parent 24333c4e3d
commit 4383cd06f1
3 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scene/gui/tab_container.cpp
View File

@@ -1031,15 +1031,13 @@ Size2 TabContainer::get_minimum_size() const {
ms.width += theme_cache.tabbar_style->get_margin(SIDE_LEFT) + theme_cache.tabbar_style->get_margin(SIDE_RIGHT);
ms.height += theme_cache.tabbar_style->get_margin(SIDE_TOP) + theme_cache.tabbar_style->get_margin(SIDE_BOTTOM);
if (!get_clip_tabs()) {
if (get_popup()) {
ms.width += theme_cache.menu_icon->get_width();
}
if (get_popup()) {
ms.width += theme_cache.menu_icon->get_width();
}
if (theme_cache.side_margin > 0 && get_tab_alignment() != TabBar::ALIGNMENT_CENTER &&
(get_tab_alignment() != TabBar::ALIGNMENT_RIGHT || !get_popup())) {
ms.width += theme_cache.side_margin;
}
if (theme_cache.side_margin > 0 && get_tab_alignment() != TabBar::ALIGNMENT_CENTER &&
(get_tab_alignment() != TabBar::ALIGNMENT_RIGHT || !get_popup())) {
ms.width += theme_cache.side_margin;
}
}
@@ -1078,9 +1076,7 @@ void TabContainer::set_popup(Node *p_popup) {
if (had_popup != bool(popup)) {
queue_redraw();
_update_margins();
if (!get_clip_tabs()) {
update_minimum_size();
}
update_minimum_size();
}
}