Skip to content

Commit d1d04b9

Browse files
lodetricklodetrick
committed
Give TabBar overridable colors per tab
1 parent 19bb187 commit d1d04b9

File tree

3 files changed

+74
-4
lines changed

3 files changed

+74
-4
lines changed

‎doc/classes/TabBar.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@
3030
Moves the scroll view to make the tab visible.
3131
</description>
3232
</method>
33+
<method name="get_font_color_override" qualifiers="const">
34+
<return type="Color" />
35+
<param index="0" name="draw_mode" type="int" enum="BaseButton.DrawMode" />
36+
<param index="1" name="tab_idx" type="int" />
37+
<description>
38+
Returns the [Color] override to the tab at index [param tab_idx] when it is displaying the [param draw_mode].
39+
[b]Note:[/b] TabBar does not currently support [code]DRAW_PRESSED_HOVERED[/code] styling.
40+
</description>
41+
</method>
3342
<method name="get_offset_buttons_visible" qualifiers="const">
3443
<return type="bool" />
3544
<description>
@@ -159,6 +168,24 @@
159168
Selects the first available tab with lower index than the currently selected. Returns [code]true[/code] if tab selection changed.
160169
</description>
161170
</method>
171+
<method name="set_font_color_override">
172+
<return type="void" />
173+
<param index="0" name="draw_mode" type="int" enum="BaseButton.DrawMode" />
174+
<param index="1" name="tab_idx" type="int" />
175+
<param index="2" name="color" type="Color" />
176+
<description>
177+
Sets a [param color] override to the tab at index [param tab_idx] when it is displaying the [param draw_mode].
178+
[b]Note:[/b] TabBar does not currently support [code]DRAW_PRESSED_HOVERED[/code] styling.
179+
</description>
180+
</method>
181+
<method name="set_font_color_override_all">
182+
<return type="void" />
183+
<param index="0" name="tab_idx" type="int" />
184+
<param index="1" name="color" type="Color" />
185+
<description>
186+
Sets a [param color] override to the tab at index [param tab_idx].
187+
</description>
188+
</method>
162189
<method name="set_tab_button_icon">
163190
<return type="void" />
164191
<param index="0" name="tab_idx" type="int" />

‎scene/gui/tab_bar.cpp‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -526,13 +526,13 @@ void TabBar::_notification(int p_what) {
526526

527527
if (tabs[i].disabled) {
528528
sb = theme_cache.tab_disabled_style;
529-
col = theme_cache.font_disabled_color;
529+
col = tabs[i].font_color_overrides[BaseButton::DrawMode::DRAW_DISABLED].a > 0 ? tabs[i].font_color_overrides[BaseButton::DrawMode::DRAW_DISABLED] : theme_cache.font_disabled_color;
530530
} else if (i == hover) {
531531
sb = theme_cache.tab_hovered_style;
532-
col = theme_cache.font_hovered_color;
532+
col = tabs[i].font_color_overrides[BaseButton::DrawMode::DRAW_HOVER].a > 0 ? tabs[i].font_color_overrides[BaseButton::DrawMode::DRAW_HOVER] : theme_cache.font_hovered_color;
533533
} else {
534534
sb = theme_cache.tab_unselected_style;
535-
col = theme_cache.font_unselected_color;
535+
col = tabs[i].font_color_overrides[BaseButton::DrawMode::DRAW_NORMAL].a > 0 ? tabs[i].font_color_overrides[BaseButton::DrawMode::DRAW_NORMAL] : theme_cache.font_unselected_color;
536536
}
537537

538538
_draw_tab(sb, col, i, rtl ? (size.width - ofs - tab_separation_offset - tabs[i].size_cache) : (ofs + tab_separation_offset), false);
@@ -550,8 +550,9 @@ void TabBar::_notification(int p_what) {
550550

551551
Ref<StyleBox> sb = tabs[current].disabled ? theme_cache.tab_disabled_style : theme_cache.tab_selected_style;
552552
float x = rtl ? (size.width - tabs[current].ofs_cache - tab_separation_offset - tabs[current].size_cache) : (tabs[current].ofs_cache + tab_separation_offset);
553+
Color col = tabs[current].font_color_overrides[BaseButton::DrawMode::DRAW_PRESSED].a > 0 ? tabs[current].font_color_overrides[BaseButton::DrawMode::DRAW_PRESSED] : theme_cache.font_selected_color;
553554

554-
_draw_tab(sb, theme_cache.font_selected_color, current, x, has_focus());
555+
_draw_tab(sb, col, current, x, has_focus());
555556
}
556557

557558
if (buttons_visible) {
@@ -1007,6 +1008,36 @@ int TabBar::get_tab_icon_max_width(int p_tab) const {
10071008
return tabs[p_tab].icon_max_width;
10081009
}
10091010

1011+
void TabBar::set_font_color_override_all(int p_tab, Color p_color) {
1012+
ERR_FAIL_INDEX(p_tab, tabs.size());
1013+
1014+
for (int i = 0; i < BaseButton::DrawMode::DRAW_HOVER_PRESSED; i++) {
1015+
tabs.write[p_tab].font_color_overrides[i] = p_color;
1016+
}
1017+
1018+
queue_redraw();
1019+
}
1020+
1021+
void TabBar::set_font_color_override(BaseButton::DrawMode p_draw_mode, int p_tab, Color p_color) {
1022+
ERR_FAIL_INDEX(p_tab, tabs.size());
1023+
ERR_FAIL_INDEX_EDMSG(p_draw_mode, BaseButton::DrawMode::DRAW_HOVER_PRESSED, "TabBar does not support hover_pressed styles.");
1024+
1025+
if (tabs[p_tab].font_color_overrides[p_draw_mode] == p_color) {
1026+
return;
1027+
}
1028+
1029+
tabs.write[p_tab].font_color_overrides[p_draw_mode] = p_color;
1030+
1031+
queue_redraw();
1032+
}
1033+
1034+
Color TabBar::get_font_color_override(BaseButton::DrawMode p_draw_mode, int p_tab) const {
1035+
ERR_FAIL_INDEX_V(p_tab, tabs.size(), Color());
1036+
ERR_FAIL_INDEX_V_EDMSG(p_draw_mode, BaseButton::DrawMode::DRAW_HOVER_PRESSED, Color(), "TabBar does not support hover_pressed styles.");
1037+
1038+
return tabs[p_tab].font_color_overrides[p_draw_mode];
1039+
}
1040+
10101041
void TabBar::set_tab_disabled(int p_tab, bool p_disabled) {
10111042
ERR_FAIL_INDEX(p_tab, tabs.size());
10121043

@@ -1971,6 +2002,9 @@ void TabBar::_bind_methods() {
19712002
ClassDB::bind_method(D_METHOD("get_tab_icon_max_width", "tab_idx"), &TabBar::get_tab_icon_max_width);
19722003
ClassDB::bind_method(D_METHOD("set_tab_button_icon", "tab_idx", "icon"), &TabBar::set_tab_button_icon);
19732004
ClassDB::bind_method(D_METHOD("get_tab_button_icon", "tab_idx"), &TabBar::get_tab_button_icon);
2005+
ClassDB::bind_method(D_METHOD("set_font_color_override_all", "tab_idx", "color"), &TabBar::set_font_color_override_all);
2006+
ClassDB::bind_method(D_METHOD("set_font_color_override", "draw_mode", "tab_idx", "color"), &TabBar::set_font_color_override);
2007+
ClassDB::bind_method(D_METHOD("get_font_color_override", "draw_mode", "tab_idx"), &TabBar::get_font_color_override);
19742008
ClassDB::bind_method(D_METHOD("set_tab_disabled", "tab_idx", "disabled"), &TabBar::set_tab_disabled);
19752009
ClassDB::bind_method(D_METHOD("is_tab_disabled", "tab_idx"), &TabBar::is_tab_disabled);
19762010
ClassDB::bind_method(D_METHOD("set_tab_hidden", "tab_idx", "hidden"), &TabBar::set_tab_hidden);

‎scene/gui/tab_bar.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#pragma once
3232

33+
#include "scene/gui/base_button.h"
3334
#include "scene/gui/control.h"
3435
#include "scene/property_list_helper.h"
3536
#include "scene/resources/text_line.h"
@@ -57,6 +58,10 @@ class TabBar : public Control {
5758
mutable RID accessibility_item_element;
5859
mutable bool accessibility_item_dirty = true;
5960

61+
// Corresponds to color overrides for the BaseButton::DrawMode enum.
62+
// Currently doesn't support DRAW_HOVER_PRESSED.
63+
Color font_color_overrides[BaseButton::DrawMode::DRAW_HOVER_PRESSED] = { Color(0, 0, 0, 0), Color(0, 0, 0, 0), Color(0, 0, 0, 0), Color(0, 0, 0, 0) };
64+
6065
String text;
6166
String tooltip;
6267

@@ -222,6 +227,10 @@ class TabBar : public Control {
222227
void set_tab_icon_max_width(int p_tab, int p_width);
223228
int get_tab_icon_max_width(int p_tab) const;
224229

230+
void set_font_color_override_all(int p_tab, Color p_color);
231+
void set_font_color_override(BaseButton::DrawMode p_draw_mode, int p_tab, Color p_color);
232+
Color get_font_color_override(BaseButton::DrawMode p_draw_mode, int p_tab) const;
233+
225234
void set_tab_disabled(int p_tab, bool p_disabled);
226235
bool is_tab_disabled(int p_tab) const;
227236

0 commit comments

Comments
 (0)