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

TabContainer Fix drawing current tab when it's disabled 

(cherry picked from commit 8004678d57)
This commit is contained in:
kleonc 2021-09-01 04:01:07 +02:00 committed by Rémi Verschelde
parent ba6d8153af
commit 59f69e2b04
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scene/gui/tab_container.cpp
View File

@ -365,10 +365,10 @@ void TabContainer::_notification(int p_what) {
} }
int tab_width = tab_widths[i]; int tab_width = tab_widths[i];
if (get_tab_disabled(index)) { if (index == current) {
_draw_tab(tab_disabled, font_color_disabled, index, tabs_ofs_cache + x);
} else if (index == current) {
x_current = x; x_current = x;
} else if (get_tab_disabled(index)) {
_draw_tab(tab_disabled, font_color_disabled, index, tabs_ofs_cache + x);
} else { } else {
_draw_tab(tab_bg, font_color_bg, index, tabs_ofs_cache + x); _draw_tab(tab_bg, font_color_bg, index, tabs_ofs_cache + x);
} }
@ -382,9 +382,10 @@ void TabContainer::_notification(int p_what) {
panel->draw(canvas, Rect2(0, header_height, size.width, size.height - header_height)); panel->draw(canvas, Rect2(0, header_height, size.width, size.height - header_height));
} }
// Draw selected tab in front. only draw selected tab when it's in visible range. // Draw selected tab in front. Only draw selected tab when it's in visible range.
if (tabs.size() > 0 && current - first_tab_cache < tab_widths.size() && current >= first_tab_cache) { if (tabs.size() > 0 && current - first_tab_cache < tab_widths.size() && current >= first_tab_cache) {
_draw_tab(tab_fg, font_color_fg, current, tabs_ofs_cache + x_current); Ref<StyleBox> current_style_box = get_tab_disabled(current) ? tab_disabled : tab_fg;
_draw_tab(current_style_box, font_color_fg, current, tabs_ofs_cache + x_current);
} }
// Draw the popup menu. // Draw the popup menu.
@ -500,9 +501,10 @@ void TabContainer::_on_mouse_exited() {
int TabContainer::_get_tab_width(int p_index) const { int TabContainer::_get_tab_width(int p_index) const {
ERR_FAIL_INDEX_V(p_index, get_tab_count(), 0); ERR_FAIL_INDEX_V(p_index, get_tab_count(), 0);
Control *control = Object::cast_to<Control>(_get_tabs()[p_index]); Control *control = get_tab_control(p_index);
if (!control || control->is_set_as_toplevel() || get_tab_hidden(p_index)) if (!control || get_tab_hidden(p_index)) {
return 0; return 0;
}
// Get the width of the text displayed on the tab. // Get the width of the text displayed on the tab.
Ref<Font> font = get_font("font"); Ref<Font> font = get_font("font");