godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58850 from YeldhamDev/more_tab_regressions

Browse Source
This commit is contained in:
Rémi Verschelde 2022-03-08 14:28:39 +01:00 committed by GitHub
commit 45fa14e1ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/TabContainer.xml
View File

@ -121,7 +121,7 @@
<argument index="0" name="tab_idx" type="int" /> <argument index="0" name="tab_idx" type="int" />
<argument index="1" name="title" type="String" /> <argument index="1" name="title" type="String" />
<description> <description>
Sets a custom title for the tab at index [code]tab_idx[/code] (tab titles default to the name of the indexed child node). Set it to blank to make it the child's name again. Sets a custom title for the tab at index [code]tab_idx[/code] (tab titles default to the name of the indexed child node). Set it back to the child's name to make the tab default to it again.
</description> </description>
</method> </method>
</methods> </methods>

6
scene/gui/tab_bar.cpp
View File

@ -71,7 +71,7 @@ Size2 TabBar::get_minimum_size() const {
Ref<Texture2D> tex = tabs[i].icon; Ref<Texture2D> tex = tabs[i].icon;
if (tex.is_valid()) { if (tex.is_valid()) {
ms.height = MAX(ms.height, tex->get_size().height); ms.height = MAX(ms.height, tex->get_size().height + y_margin);
ms.width += tex->get_size().width + hseparation; ms.width += tex->get_size().width + hseparation;
} }
@ -91,13 +91,13 @@ Size2 TabBar::get_minimum_size() const {
ms.width += button_highlight->get_margin(SIDE_LEFT) + rb->get_width() + hseparation; ms.width += button_highlight->get_margin(SIDE_LEFT) + rb->get_width() + hseparation;
} }
ms.height = MAX(rb->get_height() + style->get_minimum_size().height, ms.height); ms.height = MAX(ms.height, rb->get_height() + y_margin);
} }
if (close_visible) { if (close_visible) {
ms.width += button_highlight->get_margin(SIDE_LEFT) + close->get_width() + hseparation; ms.width += button_highlight->get_margin(SIDE_LEFT) + close->get_width() + hseparation;
ms.height = MAX(close->get_height() + style->get_minimum_size().height, ms.height); ms.height = MAX(ms.height, close->get_height() + y_margin);
} }
if (ms.width - ofs > style->get_minimum_size().width) { if (ms.width - ofs > style->get_minimum_size().width) {

5
scene/gui/tab_container.cpp
View File

@ -635,14 +635,13 @@ void TabContainer::set_tab_title(int p_tab, const String &p_title) {
Control *child = get_tab_control(p_tab); Control *child = get_tab_control(p_tab);
ERR_FAIL_COND(!child); ERR_FAIL_COND(!child);
if (p_title.is_empty()) { tab_bar->set_tab_title(p_tab, p_title);
tab_bar->set_tab_title(p_tab, String(child->get_name()));
if (p_title == child->get_name()) {
if (child->has_meta("_tab_name")) { if (child->has_meta("_tab_name")) {
child->remove_meta("_tab_name"); child->remove_meta("_tab_name");
} }
} else { } else {
tab_bar->set_tab_title(p_tab, p_title);
child->set_meta("_tab_name", p_title); child->set_meta("_tab_name", p_title);
} }