From b2f70ca10cfa84e8064e1ff2afbcb78d42849b28 Mon Sep 17 00:00:00 2001 From: toger5 Date: Tue, 15 Aug 2017 19:30:53 +0200 Subject: White Theme - almost all the colors are generated now. They get adapted based on the theme color. All the correct icons are used - error label now uses error color - added missing button colors in editor theme --- editor/code_editor.cpp | 14 ++-- editor/editor_path.cpp | 2 +- editor/editor_settings.cpp | 2 +- editor/editor_themes.cpp | 196 +++++++++++++++++++++++++++------------------ 4 files changed, 125 insertions(+), 89 deletions(-) diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 305e2e9159..ad52f445d1 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -30,6 +30,7 @@ #include "code_editor.h" #include "editor/editor_scale.h" +#include "editor_node.h" #include "editor_settings.h" #include "os/keyboard.h" #include "scene/gui/margin_container.h" @@ -544,9 +545,7 @@ FindReplaceBar::FindReplaceBar() { error_label = memnew(Label); search_options->add_child(error_label); - error_label->add_color_override("font_color", Color(1, 1, 0, 1)); - error_label->add_color_override("font_color_shadow", Color(0, 0, 0, 1)); - error_label->add_constant_override("shadow_as_outline", 1); + error_label->add_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_color("error_color", "Editor")); search_options->add_spacer(); @@ -875,7 +874,6 @@ FindReplaceDialog::FindReplaceDialog() { search_text = memnew(LineEdit); vb->add_margin_child(TTR("Search"), search_text); search_text->connect("text_entered", this, "_search_text_entered"); - //search_text->set_self_opacity(0.7); replace_label = memnew(Label); replace_label->set_text(TTR("Replace By")); @@ -887,7 +885,7 @@ FindReplaceDialog::FindReplaceDialog() { replace_text->set_anchor(MARGIN_RIGHT, ANCHOR_END); replace_text->set_begin(Point2(15, 132)); replace_text->set_end(Point2(-15, 135)); - //replace_text->set_self_opacity(0.7); + replace_mc->add_child(replace_text); replace_text->connect("text_entered", this, "_replace_text_entered"); @@ -944,9 +942,7 @@ FindReplaceDialog::FindReplaceDialog() { error_label = memnew(Label); error_label->set_align(Label::ALIGN_CENTER); - error_label->add_color_override("font_color", Color(1, 0.4, 0.3)); - error_label->add_color_override("font_color_shadow", Color(0, 0, 0, 0.2)); - error_label->add_constant_override("shadow_as_outline", 1); + error_label->add_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_color("error_color", "Editor")); vb->add_child(error_label); @@ -1220,7 +1216,7 @@ CodeTextEditor::CodeTextEditor() { status_bar->add_child(error); error->set_clip_text(true); //do not change, or else very long errors can push the whole container to the right error->set_valign(Label::VALIGN_CENTER); - error->add_color_override("font_color", Color(1, 0.7, 0.6, 0.9)); + error->add_color_override("font_color", EditorNode::get_singleton()->get_gui_base()->get_color("error_color", "Editor")); error->set_h_size_flags(SIZE_EXPAND_FILL); //required for it to display, given now it's clipping contents, do not touch Label *line_txt = memnew(Label); diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp index 92768dfe91..0587939a1a 100644 --- a/editor/editor_path.cpp +++ b/editor/editor_path.cpp @@ -160,7 +160,7 @@ void EditorPath::_notification(int p_what) { set_tooltip(obj->get_class()); - label_font->draw(ci, Point2i(ofs, (size.height - label_font->get_height()) / 2 + label_font->get_ascent()), name, Color(1, 1, 1), left); + label_font->draw(ci, Point2i(ofs, (size.height - label_font->get_height()) / 2 + label_font->get_ascent()), name, get_color("font_color", "Label"), left); } else { //add arrow diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 6398bd1623..d2b87e63af 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -570,7 +570,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { set("interface/quit_confirmation", true); set("interface/theme/preset", 0); - hints["interface/theme/preset"] = PropertyInfo(Variant::INT, "interface/theme/preset", PROPERTY_HINT_ENUM, "Default,Grey,Godot 2,Arc,Custom", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); + hints["interface/theme/preset"] = PropertyInfo(Variant::INT, "interface/theme/preset", PROPERTY_HINT_ENUM, "Default,Grey,Godot 2,Arc,Light,Custom", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); set("interface/theme/base_color", Color::html("#323b4f")); hints["interface/theme/highlight_color"] = PropertyInfo(Variant::COLOR, "interface/theme/highlight_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); set("interface/theme/highlight_color", Color::html("#699ce8")); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 6102eee89d..1250bca08a 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -86,9 +86,6 @@ static Ref change_border_color(Ref p_style, Color p_ return style; } -#define HIGHLIGHT_COLOR_LIGHT highlight_color.linear_interpolate(Color(1, 1, 1, 1), 0.3) -#define HIGHLIGHT_COLOR_DARK highlight_color.linear_interpolate(Color(0, 0, 0, 1), 0.5) - Ref editor_generate_icon(int p_index, bool dark_theme = true, Dictionary *p_colors = NULL) { Ref icon = memnew(ImageTexture); @@ -182,18 +179,20 @@ void editor_register_and_generate_icons(Ref p_theme, bool dark_theme = tr #endif } +#define HIGHLIGHT_COLOR_FONT highlight_color.linear_interpolate(dark_theme ? Color(1, 1, 1, 1) : Color(0, 0, 0, 1), 0.5) +#define HIGHLIGHT_COLOR_BG highlight_color.linear_interpolate(dark_theme ? Color(0, 0, 0, 1) : Color(1, 1, 1, 1), 0.5) + Ref create_editor_theme(const Ref p_theme) { Ref theme = Ref(memnew(Theme)); - editor_register_fonts(theme); - const float default_contrast = 0.25; - // Define colors + //Theme settings Color highlight_color = EDITOR_DEF("interface/theme/highlight_color", Color::html("#000000")); Color base_color = EDITOR_DEF("interface/theme/base_color", Color::html("#000000")); float contrast = EDITOR_DEF("interface/theme/contrast", default_contrast); + int preset = EDITOR_DEF("interface/theme/preset", 0); bool highlight_tabs = EDITOR_DEF("interface/theme/highlight_tabs", false); int border_size = EDITOR_DEF("interface/theme/border_size", 1); @@ -219,8 +218,16 @@ Ref create_editor_theme(const Ref p_theme) { base_color = Color::html("#383c4a"); contrast = 0.25; } break; + case 4: { // Light + highlight_color = Color::html("#2070ff"); + base_color = Color::html("#ffffff"); + contrast = 0.08; + } break; } + //Colors + bool dark_theme = ((base_color.r + base_color.g + base_color.b) / 3.0) < 0.5; + Color dark_color_1 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast); Color dark_color_2 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast * 1.5); Color dark_color_3 = base_color.linear_interpolate(Color(0, 0, 0, 1), contrast * 2); @@ -228,28 +235,12 @@ Ref create_editor_theme(const Ref p_theme) { Color light_color_1 = base_color.linear_interpolate(Color(1, 1, 1, 1), contrast); Color light_color_2 = base_color.linear_interpolate(Color(1, 1, 1, 1), contrast * 1.5); - const int border_width = CLAMP(border_size, 0, 3) * EDSCALE; - - Color title_color_hl = base_color; - if (highlight_tabs) - title_color_hl = base_color.linear_interpolate(Color(1, 1, 1, 1), contrast / default_contrast / 10); - bool dark_bg = ((title_color_hl.r + title_color_hl.g + title_color_hl.b) / 3.0) < 0.5; - Color title_color_hl_text_color = dark_bg ? Color(1, 1, 1, 0.9) : Color(0, 0, 0, 0.9); + Color font_color = dark_theme ? Color(1, 1, 1) : Color(0, 0, 0); + Color font_color_disabled = dark_theme ? Color(0.6, 0.6, 0.6) : Color(0.45, 0.45, 0.45); - bool dark_theme = ((base_color.r + base_color.g + base_color.b) / 3.0) < 0.5; Color separator_color = dark_theme ? Color(1, 1, 1, 0.1) : Color(0, 0, 0, 0.1); - // the resolution or the dark theme parameter has not changed, so we do not regenerate the icons - if (p_theme != NULL && fabs(p_theme->get_constant("scale", "Editor") - EDSCALE) < 0.00001 && p_theme->get_constant("dark_theme", "Editor") == dark_theme) { - for (int i = 0; i < editor_icons_count; i++) { - theme->set_icon(editor_icons_names[i], "EditorIcons", p_theme->get_icon(editor_icons_names[i], "EditorIcons")); - } - } else { - editor_register_icons(theme, dark_theme); - } - - theme->set_constant("scale", "Editor", EDSCALE); - theme->set_constant("dark_theme", "Editor", dark_theme); + const int border_width = CLAMP(border_size, 0, 3) * EDSCALE; theme->set_color("highlight_color", "Editor", highlight_color); theme->set_color("base_color", "Editor", base_color); @@ -266,15 +257,22 @@ Ref create_editor_theme(const Ref p_theme) { theme->set_color("warning_color", "Editor", warning_color); theme->set_color("error_color", "Editor", error_color); - // Checkbox icon - theme->set_icon("checked", "CheckBox", theme->get_icon("GuiChecked", "EditorIcons")); - theme->set_icon("unchecked", "CheckBox", theme->get_icon("GuiUnchecked", "EditorIcons")); - theme->set_icon("checked", "PopupMenu", theme->get_icon("GuiChecked", "EditorIcons")); - theme->set_icon("unchecked", "PopupMenu", theme->get_icon("GuiUnchecked", "EditorIcons")); - theme->set_icon("radio_checked", "CheckBox", theme->get_icon("GuiRadioChecked", "EditorIcons")); - theme->set_icon("radio_unchecked", "CheckBox", theme->get_icon("GuiRadioUnchecked", "EditorIcons")); - theme->set_icon("radio_checked", "PopupMenu", theme->get_icon("GuiChecked", "EditorIcons")); - theme->set_icon("radio_unchecked", "PopupMenu", theme->get_icon("GuiUnchecked", "EditorIcons")); + theme->set_constant("scale", "Editor", EDSCALE); + theme->set_constant("dark_theme", "Editor", dark_theme); + + //Register icons + font + + // the resolution and the icon color (dark_theme bool) has not changed, so we do not regenerate the icons + if (p_theme != NULL && fabs(p_theme->get_constant("scale", "Editor") - EDSCALE) < 0.00001 && p_theme->get_constant("dark_theme", "Editor") == dark_theme) { + // register already generated icons + for (int i = 0; i < editor_icons_count; i++) { + theme->set_icon(editor_icons_names[i], "EditorIcons", p_theme->get_icon(editor_icons_names[i], "EditorIcons")); + } + } else { + editor_register_and_generate_icons(theme, dark_theme); + } + + editor_register_fonts(theme); // Editor background Ref style_panel = make_flat_stylebox(dark_color_2, 4, 4, 4, 4); @@ -307,7 +305,6 @@ Ref create_editor_theme(const Ref p_theme) { theme->set_stylebox("pressed", "MenuButton", style_menu); theme->set_stylebox("focus", "MenuButton", style_menu); theme->set_stylebox("disabled", "MenuButton", style_menu); - theme->set_stylebox("normal", "PopupMenu", style_menu); theme->set_stylebox("hover", "PopupMenu", style_menu_hover_bg); theme->set_stylebox("pressed", "PopupMenu", style_menu); @@ -320,18 +317,20 @@ Ref create_editor_theme(const Ref p_theme) { theme->set_stylebox("focus", "ToolButton", style_menu); theme->set_stylebox("disabled", "ToolButton", style_menu); - theme->set_color("font_color_hover", "MenuButton", HIGHLIGHT_COLOR_LIGHT); - theme->set_color("font_color_hover", "ToolButton", HIGHLIGHT_COLOR_LIGHT); + theme->set_color("font_color", "MenuButton", font_color); + theme->set_color("font_color_hover", "MenuButton", HIGHLIGHT_COLOR_FONT); + theme->set_color("font_color", "ToolButton", font_color); + theme->set_color("font_color_hover", "ToolButton", HIGHLIGHT_COLOR_FONT); theme->set_color("font_color_pressed", "ToolButton", highlight_color); theme->set_stylebox("MenuHover", "EditorStyles", style_menu_hover_border); // Content of each tab Ref style_content_panel = make_flat_stylebox(base_color, 4, 5, 4, 4); - style_content_panel->set_border_color_all(title_color_hl); + style_content_panel->set_border_color_all(base_color); style_content_panel->set_border_width_all(border_width); Ref style_content_panel_vp = make_flat_stylebox(base_color, border_width, 5, border_width, border_width); - style_content_panel_vp->set_border_color_all(title_color_hl); + style_content_panel_vp->set_border_color_all(base_color); style_content_panel_vp->set_border_width_all(border_width); theme->set_stylebox("panel", "TabContainer", style_content_panel); theme->set_stylebox("Content", "EditorStyles", style_content_panel_vp); @@ -343,19 +342,19 @@ Ref create_editor_theme(const Ref p_theme) { Ref style_button_type_disabled = change_border_color(style_button_type, dark_color_2); - Color button_font_color = light_color_1.linear_interpolate(Color(1, 1, 1, 1), .6); + Color button_font_color = light_color_1.linear_interpolate(font_color, .6); // Button theme->set_stylebox("normal", "Button", style_button_type); - theme->set_stylebox("hover", "Button", change_border_color(style_button_type, HIGHLIGHT_COLOR_LIGHT)); + theme->set_stylebox("hover", "Button", change_border_color(style_button_type, HIGHLIGHT_COLOR_FONT)); theme->set_stylebox("pressed", "Button", change_border_color(style_button_type, highlight_color)); theme->set_stylebox("focus", "Button", change_border_color(style_button_type, highlight_color)); theme->set_stylebox("disabled", "Button", style_button_type_disabled); theme->set_color("font_color", "Button", button_font_color); - - theme->set_color("font_color_hover", "Button", HIGHLIGHT_COLOR_LIGHT); + theme->set_color("font_color_hover", "Button", HIGHLIGHT_COLOR_FONT); theme->set_color("font_color_pressed", "Button", highlight_color); - theme->set_color("icon_color_hover", "Button", HIGHLIGHT_COLOR_LIGHT); + theme->set_color("font_color_disabled", "Button", font_color_disabled); + theme->set_color("icon_color_hover", "Button", HIGHLIGHT_COLOR_FONT); // make icon color value bigger because icon image is not complete white theme->set_color("icon_color_pressed", "Button", Color(highlight_color.r * 1.15, highlight_color.g * 1.15, highlight_color.b * 1.15, highlight_color.a)); @@ -363,15 +362,16 @@ Ref create_editor_theme(const Ref p_theme) { Ref style_option_button = make_flat_stylebox(dark_color_1, 4, 4, 4, 4); style_option_button->set_border_width_all(border_width); style_option_button->set_border_color_all(light_color_1); - theme->set_stylebox("hover", "OptionButton", change_border_color(style_button_type, HIGHLIGHT_COLOR_LIGHT)); + theme->set_stylebox("hover", "OptionButton", change_border_color(style_button_type, HIGHLIGHT_COLOR_FONT)); theme->set_stylebox("pressed", "OptionButton", change_border_color(style_button_type, highlight_color)); theme->set_stylebox("focus", "OptionButton", change_border_color(style_button_type, highlight_color)); theme->set_stylebox("disabled", "OptionButton", style_button_type_disabled); theme->set_stylebox("normal", "OptionButton", style_button_type); theme->set_color("font_color", "OptionButton", button_font_color); - theme->set_color("font_color_hover", "OptionButton", HIGHLIGHT_COLOR_LIGHT); + theme->set_color("font_color_hover", "OptionButton", HIGHLIGHT_COLOR_FONT); theme->set_color("font_color_pressed", "OptionButton", highlight_color); - theme->set_color("icon_color_hover", "OptionButton", HIGHLIGHT_COLOR_LIGHT); + theme->set_color("font_color_disabled", "OptionButton", font_color_disabled); + theme->set_color("icon_color_hover", "OptionButton", HIGHLIGHT_COLOR_FONT); theme->set_icon("arrow", "OptionButton", theme->get_icon("GuiOptionArrow", "EditorIcons")); theme->set_constant("arrow_margin", "OptionButton", 4); theme->set_constant("modulate_arrow", "OptionButton", true); @@ -379,6 +379,23 @@ Ref create_editor_theme(const Ref p_theme) { // CheckButton theme->set_icon("on", "CheckButton", theme->get_icon("GuiToggleOn", "EditorIcons")); theme->set_icon("off", "CheckButton", theme->get_icon("GuiToggleOff", "EditorIcons")); + theme->set_color("font_color", "CheckButton", button_font_color); + theme->set_color("font_color_hover", "CheckButton", HIGHLIGHT_COLOR_FONT); + theme->set_color("font_color_pressed", "CheckButton", highlight_color); + theme->set_color("font_color_disabled", "CheckButton", font_color_disabled); + theme->set_color("icon_color_hover", "CheckButton", HIGHLIGHT_COLOR_FONT); + + // Checkbox + theme->set_icon("checked", "CheckBox", theme->get_icon("GuiChecked", "EditorIcons")); + theme->set_icon("unchecked", "CheckBox", theme->get_icon("GuiUnchecked", "EditorIcons")); + theme->set_icon("radio_checked", "CheckBox", theme->get_icon("GuiRadioChecked", "EditorIcons")); + theme->set_icon("radio_unchecked", "CheckBox", theme->get_icon("GuiRadioUnchecked", "EditorIcons")); + + theme->set_color("font_color", "CheckBox", button_font_color); + theme->set_color("font_color_hover", "CheckBox", HIGHLIGHT_COLOR_FONT); + theme->set_color("font_color_pressed", "CheckBox", highlight_color); + theme->set_color("font_color_disabled", "CheckBox", font_color_disabled); + theme->set_color("icon_color_hover", "CheckBox", HIGHLIGHT_COLOR_FONT); // PopupMenu Ref style_popup_menu = make_flat_stylebox(dark_color_1, 8, 8, 8, 8); @@ -386,6 +403,14 @@ Ref create_editor_theme(const Ref p_theme) { style_popup_menu->set_border_color_all(light_color_1); theme->set_stylebox("panel", "PopupMenu", style_popup_menu); theme->set_stylebox("separator", "PopupMenu", make_line_stylebox(separator_color, MAX(EDSCALE, border_width), 8 - MAX(EDSCALE, border_width))); + theme->set_color("font_color", "PopupMenu", font_color); + theme->set_color("font_color_hover", "PopupMenu", font_color_disabled); + theme->set_color("font_color_accel", "PopupMenu", font_color); + theme->set_color("font_color_disabled", "PopupMenu", font_color_disabled); + theme->set_icon("checked", "PopupMenu", theme->get_icon("GuiChecked", "EditorIcons")); + theme->set_icon("unchecked", "PopupMenu", theme->get_icon("GuiUnchecked", "EditorIcons")); + theme->set_icon("radio_checked", "PopupMenu", theme->get_icon("GuiChecked", "EditorIcons")); + theme->set_icon("radio_unchecked", "PopupMenu", theme->get_icon("GuiUnchecked", "EditorIcons")); // Tree & ItemList background Ref style_tree_bg = make_flat_stylebox(dark_color_1, 2, 4, 2, 4); @@ -408,18 +433,20 @@ Ref create_editor_theme(const Ref p_theme) { theme->set_stylebox("custom_button", "Tree", make_empty_stylebox()); theme->set_stylebox("custom_button_pressed", "Tree", make_empty_stylebox()); theme->set_stylebox("custom_button_hover", "Tree", style_button_type); - theme->set_color("custom_button_font_highlight", "Tree", HIGHLIGHT_COLOR_LIGHT); + theme->set_color("custom_button_font_highlight", "Tree", HIGHLIGHT_COLOR_FONT); + theme->set_color("font_color", "Tree", font_color_disabled); + theme->set_color("font_color_selected", "Tree", font_color); Ref style_tree_btn = make_flat_stylebox(light_color_1, 2, 4, 2, 4); theme->set_stylebox("button_pressed", "Tree", style_tree_btn); - Ref style_tree_focus = make_flat_stylebox(HIGHLIGHT_COLOR_DARK, 2, 2, 2, 2); + Ref style_tree_focus = make_flat_stylebox(HIGHLIGHT_COLOR_BG, 2, 2, 2, 2); theme->set_stylebox("selected_focus", "Tree", style_tree_focus); - Ref style_tree_selected = make_flat_stylebox(HIGHLIGHT_COLOR_DARK, 2, 2, 2, 2); + Ref style_tree_selected = make_flat_stylebox(HIGHLIGHT_COLOR_BG, 2, 2, 2, 2); theme->set_stylebox("selected", "Tree", style_tree_selected); - Ref style_tree_cursor = make_flat_stylebox(HIGHLIGHT_COLOR_DARK, 4, 4, 4, 4); + Ref style_tree_cursor = make_flat_stylebox(HIGHLIGHT_COLOR_BG, 4, 4, 4, 4); style_tree_cursor->set_filled(false); style_tree_cursor->set_border_width_all(border_width); style_tree_cursor->set_border_color_all(light_color_1); @@ -431,11 +458,14 @@ Ref create_editor_theme(const Ref p_theme) { theme->set_stylebox("title_button_hover", "Tree", style_tree_title); theme->set_stylebox("title_button_pressed", "Tree", style_tree_title); - theme->set_color("prop_category", "Editor", dark_color_1.linear_interpolate(Color(1, 1, 1, 1), 0.12)); - theme->set_color("prop_section", "Editor", dark_color_1.linear_interpolate(Color(1, 1, 1, 1), 0.09)); - theme->set_color("prop_subsection", "Editor", dark_color_1.linear_interpolate(Color(1, 1, 1, 1), 0.06)); - theme->set_color("fg_selected", "Editor", HIGHLIGHT_COLOR_DARK); - theme->set_color("fg_error", "Editor", theme->get_color("error_color", "Editor")); + Color prop_category_color = dark_theme ? dark_color_1.linear_interpolate(Color(1, 1, 1, 1), 0.12) : dark_color_1.linear_interpolate(Color(0, 0, 0, 1), 0.2); + Color prop_section_color = dark_theme ? dark_color_1.linear_interpolate(Color(1, 1, 1, 1), 0.09) : dark_color_1.linear_interpolate(Color(0, 1, 0, 1), 0.1); + Color prop_subsection_color = dark_theme ? dark_color_1.linear_interpolate(Color(1, 1, 1, 1), 0.06) : dark_color_1.linear_interpolate(Color(0, 0, 0, 1), 0.1); + theme->set_color("prop_category", "Editor", prop_category_color); + theme->set_color("prop_section", "Editor", prop_section_color); + theme->set_color("prop_subsection", "Editor", prop_subsection_color); + theme->set_color("fg_selected", "Editor", HIGHLIGHT_COLOR_BG); + theme->set_color("fg_error", "Editor", error_color); theme->set_color("drop_position_color", "Tree", highlight_color); // ItemList @@ -446,7 +476,7 @@ Ref create_editor_theme(const Ref p_theme) { Ref style_itemlist_cursor = make_flat_stylebox(highlight_color, 0, 0, 0, 0); style_itemlist_cursor->set_filled(false); style_itemlist_cursor->set_border_width_all(border_width); - style_itemlist_cursor->set_border_color_all(HIGHLIGHT_COLOR_DARK); + style_itemlist_cursor->set_border_color_all(HIGHLIGHT_COLOR_BG); theme->set_stylebox("cursor", "ItemList", style_itemlist_cursor); theme->set_stylebox("cursor_unfocused", "ItemList", style_itemlist_cursor); theme->set_stylebox("selected_focus", "ItemList", style_tree_focus); @@ -454,8 +484,9 @@ Ref create_editor_theme(const Ref p_theme) { theme->set_stylebox("bg_focus", "ItemList", focus_sbt); theme->set_stylebox("bg", "ItemList", style_itemlist_bg); theme->set_constant("vseparation", "ItemList", 5 * EDSCALE); + theme->set_color("font_color", "ItemList", font_color); - Ref style_tab_fg = make_flat_stylebox(title_color_hl, 15, 5, 15, 5); + Ref style_tab_fg = make_flat_stylebox(base_color, 15, 5, 15, 5); Ref style_tab_bg = make_flat_stylebox(base_color, 15, 5, 15, 5); style_tab_bg->set_filled(false); @@ -464,11 +495,13 @@ Ref create_editor_theme(const Ref p_theme) { theme->set_stylebox("tab_bg", "TabContainer", style_tab_bg); theme->set_stylebox("tab_fg", "Tabs", style_tab_fg); theme->set_stylebox("tab_bg", "Tabs", style_tab_bg); - theme->set_color("font_color_fg", "TabContainer", title_color_hl_text_color); - theme->set_color("font_color_bg", "TabContainer", light_color_2); + theme->set_color("font_color_fg", "TabContainer", font_color); + theme->set_color("font_color_bg", "TabContainer", font_color_disabled); + theme->set_color("font_color_fg", "Tabs", font_color); + theme->set_color("font_color_bg", "Tabs", font_color_disabled); theme->set_icon("menu", "TabContainer", theme->get_icon("GuiTabMenu", "EditorIcons")); theme->set_icon("menu_hl", "TabContainer", theme->get_icon("GuiTabMenu", "EditorIcons")); - theme->set_stylebox("SceneTabFG", "EditorStyles", make_flat_stylebox(title_color_hl, 10, 5, 10, 5)); + theme->set_stylebox("SceneTabFG", "EditorStyles", make_flat_stylebox(base_color, 10, 5, 10, 5)); theme->set_stylebox("SceneTabBG", "EditorStyles", make_empty_stylebox(6, 5, 6, 5)); theme->set_icon("close", "Tabs", theme->get_icon("GuiClose", "EditorIcons")); theme->set_stylebox("button_pressed", "Tabs", style_menu); @@ -490,15 +523,16 @@ Ref create_editor_theme(const Ref p_theme) { theme->set_stylebox("DebuggerTabBG", "EditorStyles", style_tab_bg_debugger); // LineEdit - Ref style_lineedit = style_button_type; - style_lineedit = change_border_color(style_lineedit, light_color_1); - Ref style_lineedit_disabled = change_border_color(style_lineedit, dark_color_1); - style_lineedit_disabled->set_bg_color(Color(0, 0, 0, .1)); - Ref style_lineedit_focus = change_border_color(style_lineedit, highlight_color); - theme->set_stylebox("normal", "LineEdit", style_lineedit); - theme->set_stylebox("focus", "LineEdit", style_lineedit_focus); - theme->set_stylebox("read_only", "LineEdit", style_lineedit_disabled); - theme->set_color("read_only", "LineEdit", dark_color_1); + Ref style_line_edit = make_flat_stylebox(dark_color_2, 6, 4, 6, 4); + style_line_edit = change_border_color(style_line_edit, light_color_1); + Ref style_line_edit_disabled = change_border_color(style_line_edit, dark_color_1); + style_line_edit_disabled->set_bg_color(Color(0, 0, 0, .1)); + Ref style_line_edit_focus = change_border_color(style_line_edit, highlight_color); + theme->set_stylebox("normal", "LineEdit", style_line_edit); + theme->set_stylebox("focus", "LineEdit", style_line_edit_focus); + theme->set_stylebox("read_only", "LineEdit", style_line_edit_disabled); + theme->set_color("read_only", "LineEdit", font_color_disabled); + theme->set_color("font_color", "LineEdit", font_color); // TextEdit Ref style_textedit_normal(memnew(StyleBoxFlat)); @@ -524,11 +558,11 @@ Ref create_editor_theme(const Ref p_theme) { // WindowDialog Ref style_window = make_flat_stylebox(dark_color_2, 4, 4, 4, 4); style_window->set_border_width_all(MAX(EDSCALE, border_width)); - style_window->set_border_color_all(title_color_hl); + style_window->set_border_color_all(base_color); style_window->set_border_width(MARGIN_TOP, 24 * EDSCALE); style_window->set_expand_margin_size(MARGIN_TOP, 24 * EDSCALE); theme->set_stylebox("panel", "WindowDialog", style_window); - theme->set_color("title_color", "WindowDialog", title_color_hl_text_color); + theme->set_color("title_color", "WindowDialog", font_color); theme->set_icon("close", "WindowDialog", theme->get_icon("GuiClose", "EditorIcons")); theme->set_icon("close_highlight", "WindowDialog", theme->get_icon("GuiClose", "EditorIcons")); theme->set_constant("close_h_ofs", "WindowDialog", 22 * EDSCALE); @@ -572,15 +606,20 @@ Ref create_editor_theme(const Ref p_theme) { theme->set_icon("grabber_highlight", "VSlider", theme->get_icon("GuiSliderGrabberHl", "EditorIcons")); //RichTextLabel + theme->set_color("font_color", "RichTextLabel", font_color); theme->set_stylebox("focus", "RichTextLabel", make_empty_stylebox()); // Panel theme->set_stylebox("panel", "Panel", style_panel); + // Label + theme->set_color("font_color", "Label", font_color); + // TooltipPanel Ref style_tooltip = make_flat_stylebox(Color(1, 1, 1, 0.8), 8, 8, 8, 8); style_tooltip->set_border_width_all(border_width); - style_tooltip->set_border_color_all(Color(1, 1, 1, 0.9)); + style_tooltip->set_border_color_all(HIGHLIGHT_COLOR_FONT); + theme->set_color("font_color", "TooltipPanel", font_color); theme->set_stylebox("panel", "TooltipPanel", style_tooltip); // PopupPanel @@ -596,14 +635,15 @@ Ref create_editor_theme(const Ref p_theme) { // ProgressBar theme->set_stylebox("bg", "ProgressBar", make_stylebox(theme->get_icon("GuiProgressBar", "EditorIcons"), 4, 4, 4, 4, 0, 0, 0, 0)); theme->set_stylebox("fg", "ProgressBar", make_stylebox(theme->get_icon("GuiProgressFill", "EditorIcons"), 6, 6, 6, 6, 2, 1, 2, 1)); - - // theme->set_font("font", "ProgressBar", default_font); - - // theme->set_color("font_color", "ProgressBar", control_font_color_hover); - theme->set_color("font_color_shadow", "ProgressBar", Color(0, 0, 0)); + theme->set_color("font_color", "ProgressBar", font_color); // GraphEdit theme->set_stylebox("bg", "GraphEdit", make_flat_stylebox(dark_color_2, 4, 4, 4, 4)); + theme->set_color("grid_major", "GraphEdit", Color(font_color.r, font_color.g, font_color.b, 0.2)); + theme->set_color("grid_minor", "GraphEdit", Color(font_color_disabled.r, font_color_disabled.g, font_color_disabled.b, 0.2)); + theme->set_icon("minus", "GraphEdit", theme->get_icon("ZoomLess", "EditorIcons")); + theme->set_icon("more", "GraphEdit", theme->get_icon("ZoomMore", "EditorIcons")); + theme->set_icon("reset", "GraphEdit", theme->get_icon("ZoomReset", "EditorIcons")); // GraphNode Ref graphsb = make_flat_stylebox(Color(0, 0, 0, 0.3), 16, 24, 16, 5); -- cgit v1.2.3