noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Change themes *_color_* to *_*_color

Browse Source 
Changed:
font_color_accel -> font_accelerator_color
font_color_bg -> font_unselected_color
font_color_disabled -> font_disabled_color
font_color_fg -> font_selected_color
font_color_hover -> font_hover_color
font_color_hover_pressed -> font_hover_pressed_color
font_color_pressed -> font_pressed_color
font_color_readonly -> font_readonly_color
font_color_selected -> font_selected_color
font_color_shadow -> font_shadow_color
font_color_uneditable -> font_uneditable_color
icon_color_disabled -> icon_disabled_color
icon_color_hover -> icon_hover_color
icon_color_hover_pressed -> icon_hover_pressed_color
icon_color_normal -> icon_normal_color
icon_color_pressed -> icon_pressed_color

Also includes:
font_outline_modulate -> font_outline_color
tab_fg -> tab_selected
tab_bg -> tab_unselected
This commit is contained in:
Marcel Admiraal
2020-12-08 13:11:45 +00:00
parent d39f6386ce
commit 8eb39f4e8b
47 changed files with 352 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
scene/gui/button.cpp
View File

@@ -102,8 +102,8 @@ void Button::_notification(int p_what) {
style->draw(ci, Rect2(Point2(0, 0), size));
}
color = get_theme_color("font_color");
if (has_theme_color("icon_color_normal")) {
color_icon = get_theme_color("icon_color_normal");
if (has_theme_color("icon_normal_color")) {
color_icon = get_theme_color("icon_normal_color");
}
} break;
case DRAW_HOVER_PRESSED: {
@@ -117,13 +117,13 @@ void Button::_notification(int p_what) {
if (!flat) {
style->draw(ci, Rect2(Point2(0, 0), size));
}
if (has_theme_color("font_color_hover_pressed")) {
color = get_theme_color("font_color_hover_pressed");
if (has_theme_color("font_hover_pressed_color")) {
color = get_theme_color("font_hover_pressed_color");
} else {
color = get_theme_color("font_color");
}
if (has_theme_color("icon_color_hover_pressed")) {
color_icon = get_theme_color("icon_color_hover_pressed");
if (has_theme_color("icon_hover_pressed_color")) {
color_icon = get_theme_color("icon_hover_pressed_color");
}
break;
@@ -140,13 +140,13 @@ void Button::_notification(int p_what) {
if (!flat) {
style->draw(ci, Rect2(Point2(0, 0), size));
}
if (has_theme_color("font_color_pressed")) {
color = get_theme_color("font_color_pressed");
if (has_theme_color("font_pressed_color")) {
color = get_theme_color("font_pressed_color");
} else {
color = get_theme_color("font_color");
}
if (has_theme_color("icon_color_pressed")) {
color_icon = get_theme_color("icon_color_pressed");
if (has_theme_color("icon_pressed_color")) {
color_icon = get_theme_color("icon_pressed_color");
}
} break;
@@ -160,9 +160,9 @@ void Button::_notification(int p_what) {
if (!flat) {
style->draw(ci, Rect2(Point2(0, 0), size));
}
color = get_theme_color("font_color_hover");
if (has_theme_color("icon_color_hover")) {
color_icon = get_theme_color("icon_color_hover");
color = get_theme_color("font_hover_color");
if (has_theme_color("icon_hover_color")) {
color_icon = get_theme_color("icon_hover_color");
}
} break;
@@ -176,9 +176,9 @@ void Button::_notification(int p_what) {
if (!flat) {
style->draw(ci, Rect2(Point2(0, 0), size));
}
color = get_theme_color("font_color_disabled");
if (has_theme_color("icon_color_disabled")) {
color_icon = get_theme_color("icon_color_disabled");
color = get_theme_color("font_disabled_color");
if (has_theme_color("icon_disabled_color")) {
color_icon = get_theme_color("icon_disabled_color");
}
} break;
@@ -303,10 +303,10 @@ void Button::_notification(int p_what) {
text_ofs.x -= icon_ofs.x;
}
Color font_outline_modulate = get_theme_color("font_outline_modulate");
Color font_outline_color = get_theme_color("font_outline_color");
int outline_size = get_theme_constant("outline_size");
if (outline_size > 0 && font_outline_modulate.a > 0) {
text_buf->draw_outline(ci, text_ofs.floor(), outline_size, font_outline_modulate);
if (outline_size > 0 && font_outline_color.a > 0) {
text_buf->draw_outline(ci, text_ofs.floor(), outline_size, font_outline_color);
}
text_buf->draw(ci, text_ofs.floor(), color);