asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Properly handle different border widths in rounded corner aa

Browse source 
Note: removed (unused and not implemented) support for multiple border colors
This commit is contained in:
PouleyKetchoupp 2019-03-19 10:32:13 +01:00
parent cb097283db
commit 8346d90c5e
6 changed files with 118 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
editor/editor_themes.cpp
View file

@ -403,7 +403,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
// this is the most commonly used stylebox, variations should be made as duplicate of this // this is the most commonly used stylebox, variations should be made as duplicate of this
Ref<StyleBoxFlat> style_default = make_flat_stylebox(base_color, default_margin_size, default_margin_size, default_margin_size, default_margin_size); Ref<StyleBoxFlat> style_default = make_flat_stylebox(base_color, default_margin_size, default_margin_size, default_margin_size, default_margin_size);
style_default->set_border_width_all(border_width); style_default->set_border_width_all(border_width);
style_default->set_border_color_all(base_color); style_default->set_border_color(base_color);
style_default->set_draw_center(true); style_default->set_draw_center(true);
// Button and widgets // Button and widgets
@ -415,20 +415,20 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
style_widget->set_default_margin(MARGIN_RIGHT, (extra_spacing + 6) * EDSCALE); style_widget->set_default_margin(MARGIN_RIGHT, (extra_spacing + 6) * EDSCALE);
style_widget->set_default_margin(MARGIN_BOTTOM, (extra_spacing + default_margin_size) * EDSCALE); style_widget->set_default_margin(MARGIN_BOTTOM, (extra_spacing + default_margin_size) * EDSCALE);
style_widget->set_bg_color(dark_color_1); style_widget->set_bg_color(dark_color_1);
style_widget->set_border_color_all(dark_color_2); style_widget->set_border_color(dark_color_2);
Ref<StyleBoxFlat> style_widget_disabled = style_widget->duplicate(); Ref<StyleBoxFlat> style_widget_disabled = style_widget->duplicate();
style_widget_disabled->set_border_color_all(color_disabled); style_widget_disabled->set_border_color(color_disabled);
style_widget_disabled->set_bg_color(color_disabled_bg); style_widget_disabled->set_bg_color(color_disabled_bg);
Ref<StyleBoxFlat> style_widget_focus = style_widget->duplicate(); Ref<StyleBoxFlat> style_widget_focus = style_widget->duplicate();
style_widget_focus->set_border_color_all(accent_color); style_widget_focus->set_border_color(accent_color);
Ref<StyleBoxFlat> style_widget_pressed = style_widget->duplicate(); Ref<StyleBoxFlat> style_widget_pressed = style_widget->duplicate();
style_widget_pressed->set_border_color_all(accent_color); style_widget_pressed->set_border_color(accent_color);
Ref<StyleBoxFlat> style_widget_hover = style_widget->duplicate(); Ref<StyleBoxFlat> style_widget_hover = style_widget->duplicate();
style_widget_hover->set_border_color_all(contrast_color_1); style_widget_hover->set_border_color(contrast_color_1);
// style for windows, popups, etc.. // style for windows, popups, etc..
Ref<StyleBoxFlat> style_popup = style_default->duplicate(); Ref<StyleBoxFlat> style_popup = style_default->duplicate();
@ -437,7 +437,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
style_popup->set_default_margin(MARGIN_TOP, popup_margin_size); style_popup->set_default_margin(MARGIN_TOP, popup_margin_size);
style_popup->set_default_margin(MARGIN_RIGHT, popup_margin_size); style_popup->set_default_margin(MARGIN_RIGHT, popup_margin_size);
style_popup->set_default_margin(MARGIN_BOTTOM, popup_margin_size); style_popup->set_default_margin(MARGIN_BOTTOM, popup_margin_size);
style_popup->set_border_color_all(contrast_color_1); style_popup->set_border_color(contrast_color_1);
style_popup->set_border_width_all(MAX(EDSCALE, border_width)); style_popup->set_border_width_all(MAX(EDSCALE, border_width));
const Color shadow_color = Color(0, 0, 0, dark_theme ? 0.3 : 0.1); const Color shadow_color = Color(0, 0, 0, dark_theme ? 0.3 : 0.1);
style_popup->set_shadow_color(shadow_color); style_popup->set_shadow_color(shadow_color);
@ -470,7 +470,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
style_tab_selected->set_border_width_all(border_width); style_tab_selected->set_border_width_all(border_width);
style_tab_selected->set_border_width(MARGIN_BOTTOM, 0); style_tab_selected->set_border_width(MARGIN_BOTTOM, 0);
style_tab_selected->set_border_color_all(dark_color_3); style_tab_selected->set_border_color(dark_color_3);
style_tab_selected->set_expand_margin_size(MARGIN_BOTTOM, border_width); style_tab_selected->set_expand_margin_size(MARGIN_BOTTOM, border_width);
style_tab_selected->set_default_margin(MARGIN_LEFT, tab_default_margin_side); style_tab_selected->set_default_margin(MARGIN_LEFT, tab_default_margin_side);
style_tab_selected->set_default_margin(MARGIN_RIGHT, tab_default_margin_side); style_tab_selected->set_default_margin(MARGIN_RIGHT, tab_default_margin_side);
@ -480,11 +480,11 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
Ref<StyleBoxFlat> style_tab_unselected = style_tab_selected->duplicate(); Ref<StyleBoxFlat> style_tab_unselected = style_tab_selected->duplicate();
style_tab_unselected->set_bg_color(dark_color_1); style_tab_unselected->set_bg_color(dark_color_1);
style_tab_unselected->set_border_color_all(dark_color_2); style_tab_unselected->set_border_color(dark_color_2);
Ref<StyleBoxFlat> style_tab_disabled = style_tab_selected->duplicate(); Ref<StyleBoxFlat> style_tab_disabled = style_tab_selected->duplicate();
style_tab_disabled->set_bg_color(color_disabled_bg); style_tab_disabled->set_bg_color(color_disabled_bg);
style_tab_disabled->set_border_color_all(color_disabled); style_tab_disabled->set_border_color(color_disabled);
// Editor background // Editor background
theme->set_stylebox("Background", "EditorStyles", make_flat_stylebox(background_color, default_margin_size, default_margin_size, default_margin_size, default_margin_size)); theme->set_stylebox("Background", "EditorStyles", make_flat_stylebox(background_color, default_margin_size, default_margin_size, default_margin_size, default_margin_size));
@ -492,7 +492,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
// Focus // Focus
Ref<StyleBoxFlat> style_focus = style_default->duplicate(); Ref<StyleBoxFlat> style_focus = style_default->duplicate();
style_focus->set_draw_center(false); style_focus->set_draw_center(false);
style_focus->set_border_color_all(contrast_color_2); style_focus->set_border_color(contrast_color_2);
theme->set_stylebox("Focus", "EditorStyles", style_focus); theme->set_stylebox("Focus", "EditorStyles", style_focus);
// Menu // Menu
@ -514,7 +514,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
style_menu_hover_border->set_draw_center(false); style_menu_hover_border->set_draw_center(false);
style_menu_hover_border->set_border_width_all(0); style_menu_hover_border->set_border_width_all(0);
style_menu_hover_border->set_border_width(MARGIN_BOTTOM, border_width); style_menu_hover_border->set_border_width(MARGIN_BOTTOM, border_width);
style_menu_hover_border->set_border_color_all(accent_color); style_menu_hover_border->set_border_color(accent_color);
Ref<StyleBoxFlat> style_menu_hover_bg = style_widget->duplicate(); Ref<StyleBoxFlat> style_menu_hover_bg = style_widget->duplicate();
style_menu_hover_bg->set_border_width_all(0); style_menu_hover_bg->set_border_width_all(0);
@ -644,11 +644,9 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
Ref<StyleBoxFlat> sub_inspector_bg = make_flat_stylebox(dark_color_1.linear_interpolate(accent_color, 0.08), 2, 0, 2, 2); Ref<StyleBoxFlat> sub_inspector_bg = make_flat_stylebox(dark_color_1.linear_interpolate(accent_color, 0.08), 2, 0, 2, 2);
sub_inspector_bg->set_border_width(MARGIN_LEFT, 2); sub_inspector_bg->set_border_width(MARGIN_LEFT, 2);
sub_inspector_bg->set_border_color(MARGIN_LEFT, accent_color * Color(1, 1, 1, 0.3));
sub_inspector_bg->set_border_width(MARGIN_RIGHT, 2); sub_inspector_bg->set_border_width(MARGIN_RIGHT, 2);
sub_inspector_bg->set_border_color(MARGIN_RIGHT, accent_color * Color(1, 1, 1, 0.3));
sub_inspector_bg->set_border_width(MARGIN_BOTTOM, 2); sub_inspector_bg->set_border_width(MARGIN_BOTTOM, 2);
sub_inspector_bg->set_border_color(MARGIN_BOTTOM, accent_color * Color(1, 1, 1, 0.3)); sub_inspector_bg->set_border_color(accent_color * Color(1, 1, 1, 0.3));
sub_inspector_bg->set_draw_center(true); sub_inspector_bg->set_draw_center(true);
theme->set_stylebox("sub_inspector_bg", "Editor", sub_inspector_bg); theme->set_stylebox("sub_inspector_bg", "Editor", sub_inspector_bg);
@ -657,7 +655,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
// Tree & ItemList background // Tree & ItemList background
Ref<StyleBoxFlat> style_tree_bg = style_default->duplicate(); Ref<StyleBoxFlat> style_tree_bg = style_default->duplicate();
style_tree_bg->set_bg_color(dark_color_1); style_tree_bg->set_bg_color(dark_color_1);
style_tree_bg->set_border_color_all(dark_color_3); style_tree_bg->set_border_color(dark_color_3);
theme->set_stylebox("bg", "Tree", style_tree_bg); theme->set_stylebox("bg", "Tree", style_tree_bg);
const Color guide_color = Color(mono_color.r, mono_color.g, mono_color.b, 0.05); const Color guide_color = Color(mono_color.r, mono_color.g, mono_color.b, 0.05);
@ -708,7 +706,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
Ref<StyleBoxFlat> style_tree_cursor = style_default->duplicate(); Ref<StyleBoxFlat> style_tree_cursor = style_default->duplicate();
style_tree_cursor->set_draw_center(false); style_tree_cursor->set_draw_center(false);
style_tree_cursor->set_border_width_all(border_width); style_tree_cursor->set_border_width_all(border_width);
style_tree_cursor->set_border_color_all(contrast_color_1); style_tree_cursor->set_border_color(contrast_color_1);
Ref<StyleBoxFlat> style_tree_title = style_default->duplicate(); Ref<StyleBoxFlat> style_tree_title = style_default->duplicate();
style_tree_title->set_bg_color(dark_color_3); style_tree_title->set_bg_color(dark_color_3);
@ -731,12 +729,12 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
Ref<StyleBoxFlat> style_itemlist_bg = style_default->duplicate(); Ref<StyleBoxFlat> style_itemlist_bg = style_default->duplicate();
style_itemlist_bg->set_bg_color(dark_color_1); style_itemlist_bg->set_bg_color(dark_color_1);
style_itemlist_bg->set_border_width_all(border_width); style_itemlist_bg->set_border_width_all(border_width);
style_itemlist_bg->set_border_color_all(dark_color_3); style_itemlist_bg->set_border_color(dark_color_3);
Ref<StyleBoxFlat> style_itemlist_cursor = style_default->duplicate(); Ref<StyleBoxFlat> style_itemlist_cursor = style_default->duplicate();
style_itemlist_cursor->set_draw_center(false); style_itemlist_cursor->set_draw_center(false);
style_itemlist_cursor->set_border_width_all(border_width); style_itemlist_cursor->set_border_width_all(border_width);
style_itemlist_cursor->set_border_color_all(highlight_color); style_itemlist_cursor->set_border_color(highlight_color);
theme->set_stylebox("cursor", "ItemList", style_itemlist_cursor); theme->set_stylebox("cursor", "ItemList", style_itemlist_cursor);
theme->set_stylebox("cursor_unfocused", "ItemList", style_itemlist_cursor); theme->set_stylebox("cursor_unfocused", "ItemList", style_itemlist_cursor);
theme->set_stylebox("selected_focus", "ItemList", style_tree_focus); theme->set_stylebox("selected_focus", "ItemList", style_tree_focus);
@ -781,7 +779,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
// Content of each tab // Content of each tab
Ref<StyleBoxFlat> style_content_panel = style_default->duplicate(); Ref<StyleBoxFlat> style_content_panel = style_default->duplicate();
style_content_panel->set_border_color_all(dark_color_3); style_content_panel->set_border_color(dark_color_3);
style_content_panel->set_border_width_all(border_width); style_content_panel->set_border_width_all(border_width);
// compensate the border // compensate the border
style_content_panel->set_default_margin(MARGIN_TOP, margin_size_extra * EDSCALE); style_content_panel->set_default_margin(MARGIN_TOP, margin_size_extra * EDSCALE);
@ -859,7 +857,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
// WindowDialog // WindowDialog
Ref<StyleBoxFlat> style_window = style_popup->duplicate(); Ref<StyleBoxFlat> style_window = style_popup->duplicate();
style_window->set_border_color_all(tab_color); style_window->set_border_color(tab_color);
style_window->set_border_width(MARGIN_TOP, 24 * EDSCALE); style_window->set_border_width(MARGIN_TOP, 24 * EDSCALE);
style_window->set_expand_margin_size(MARGIN_TOP, 24 * EDSCALE); style_window->set_expand_margin_size(MARGIN_TOP, 24 * EDSCALE);
theme->set_stylebox("panel", "WindowDialog", style_window); theme->set_stylebox("panel", "WindowDialog", style_window);
@ -874,7 +872,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
// complex window, for now only Editor settings and Project settings // complex window, for now only Editor settings and Project settings
Ref<StyleBoxFlat> style_complex_window = style_window->duplicate(); Ref<StyleBoxFlat> style_complex_window = style_window->duplicate();
style_complex_window->set_bg_color(dark_color_2); style_complex_window->set_bg_color(dark_color_2);
style_complex_window->set_border_color_all(highlight_tabs ? tab_color : dark_color_2); style_complex_window->set_border_color(highlight_tabs ? tab_color : dark_color_2);
theme->set_stylebox("panel", "EditorSettingsDialog", style_complex_window); theme->set_stylebox("panel", "EditorSettingsDialog", style_complex_window);
theme->set_stylebox("panel", "ProjectSettingsEditor", style_complex_window); theme->set_stylebox("panel", "ProjectSettingsEditor", style_complex_window);
theme->set_stylebox("panel", "EditorAbout", style_complex_window); theme->set_stylebox("panel", "EditorAbout", style_complex_window);
@ -953,7 +951,7 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
style_tooltip->set_default_margin(MARGIN_BOTTOM, v); style_tooltip->set_default_margin(MARGIN_BOTTOM, v);
style_tooltip->set_bg_color(Color(mono_color.r, mono_color.g, mono_color.b, 0.9)); style_tooltip->set_bg_color(Color(mono_color.r, mono_color.g, mono_color.b, 0.9));
style_tooltip->set_border_width_all(border_width); style_tooltip->set_border_width_all(border_width);
style_tooltip->set_border_color_all(mono_color); style_tooltip->set_border_color(mono_color);
theme->set_color("font_color", "TooltipLabel", font_color.inverted()); theme->set_color("font_color", "TooltipLabel", font_color.inverted());
theme->set_color("font_color_shadow", "TooltipLabel", mono_color.inverted() * Color(1, 1, 1, 0.1)); theme->set_color("font_color_shadow", "TooltipLabel", mono_color.inverted() * Color(1, 1, 1, 0.1));
theme->set_stylebox("panel", "TooltipPanel", style_tooltip); theme->set_stylebox("panel", "TooltipPanel", style_tooltip);
@ -988,32 +986,32 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) {
const int gn_margin_side = 28; const int gn_margin_side = 28;
Ref<StyleBoxFlat> graphsb = make_flat_stylebox(Color(mv, mv, mv, 0.7), gn_margin_side, 24, gn_margin_side, 5); Ref<StyleBoxFlat> graphsb = make_flat_stylebox(Color(mv, mv, mv, 0.7), gn_margin_side, 24, gn_margin_side, 5);
graphsb->set_border_width_all(border_width); graphsb->set_border_width_all(border_width);
graphsb->set_border_color_all(Color(mv2, mv2, mv2, 0.9)); graphsb->set_border_color(Color(mv2, mv2, mv2, 0.9));
Ref<StyleBoxFlat> graphsbselected = make_flat_stylebox(Color(mv, mv, mv, 0.9), gn_margin_side, 24, gn_margin_side, 5); Ref<StyleBoxFlat> graphsbselected = make_flat_stylebox(Color(mv, mv, mv, 0.9), gn_margin_side, 24, gn_margin_side, 5);
graphsbselected->set_border_width_all(border_width); graphsbselected->set_border_width_all(border_width);
graphsbselected->set_border_color_all(Color(accent_color.r, accent_color.g, accent_color.b, 0.9)); graphsbselected->set_border_color(Color(accent_color.r, accent_color.g, accent_color.b, 0.9));
graphsbselected->set_shadow_size(8 * EDSCALE); graphsbselected->set_shadow_size(8 * EDSCALE);
graphsbselected->set_shadow_color(shadow_color); graphsbselected->set_shadow_color(shadow_color);
Ref<StyleBoxFlat> graphsbcomment = make_flat_stylebox(Color(mv, mv, mv, 0.3), gn_margin_side, 24, gn_margin_side, 5); Ref<StyleBoxFlat> graphsbcomment = make_flat_stylebox(Color(mv, mv, mv, 0.3), gn_margin_side, 24, gn_margin_side, 5);
graphsbcomment->set_border_width_all(border_width); graphsbcomment->set_border_width_all(border_width);
graphsbcomment->set_border_color_all(Color(mv2, mv2, mv2, 0.9)); graphsbcomment->set_border_color(Color(mv2, mv2, mv2, 0.9));
Ref<StyleBoxFlat> graphsbcommentselected = make_flat_stylebox(Color(mv, mv, mv, 0.4), gn_margin_side, 24, gn_margin_side, 5); Ref<StyleBoxFlat> graphsbcommentselected = make_flat_stylebox(Color(mv, mv, mv, 0.4), gn_margin_side, 24, gn_margin_side, 5);
graphsbcommentselected->set_border_width_all(border_width); graphsbcommentselected->set_border_width_all(border_width);
graphsbcommentselected->set_border_color_all(Color(mv2, mv2, mv2, 0.9)); graphsbcommentselected->set_border_color(Color(mv2, mv2, mv2, 0.9));
Ref<StyleBoxFlat> graphsbbreakpoint = graphsbselected->duplicate(); Ref<StyleBoxFlat> graphsbbreakpoint = graphsbselected->duplicate();
graphsbbreakpoint->set_draw_center(false); graphsbbreakpoint->set_draw_center(false);
graphsbbreakpoint->set_border_color_all(warning_color); graphsbbreakpoint->set_border_color(warning_color);
graphsbbreakpoint->set_shadow_color(warning_color * Color(1.0, 1.0, 1.0, 0.1)); graphsbbreakpoint->set_shadow_color(warning_color * Color(1.0, 1.0, 1.0, 0.1));
Ref<StyleBoxFlat> graphsbposition = graphsbselected->duplicate(); Ref<StyleBoxFlat> graphsbposition = graphsbselected->duplicate();
graphsbposition->set_draw_center(false); graphsbposition->set_draw_center(false);
graphsbposition->set_border_color_all(error_color); graphsbposition->set_border_color(error_color);
graphsbposition->set_shadow_color(error_color * Color(1.0, 1.0, 1.0, 0.2)); graphsbposition->set_shadow_color(error_color * Color(1.0, 1.0, 1.0, 0.2));
Ref<StyleBoxFlat> smgraphsb = make_flat_stylebox(Color(mv, mv, mv, 0.7), gn_margin_side, 24, gn_margin_side, 5); Ref<StyleBoxFlat> smgraphsb = make_flat_stylebox(Color(mv, mv, mv, 0.7), gn_margin_side, 24, gn_margin_side, 5);
smgraphsb->set_border_width_all(border_width); smgraphsb->set_border_width_all(border_width);
smgraphsb->set_border_color_all(Color(mv2, mv2, mv2, 0.9)); smgraphsb->set_border_color(Color(mv2, mv2, mv2, 0.9));
Ref<StyleBoxFlat> smgraphsbselected = make_flat_stylebox(Color(mv, mv, mv, 0.9), gn_margin_side, 24, gn_margin_side, 5); Ref<StyleBoxFlat> smgraphsbselected = make_flat_stylebox(Color(mv, mv, mv, 0.9), gn_margin_side, 24, gn_margin_side, 5);
smgraphsbselected->set_border_width_all(border_width); smgraphsbselected->set_border_width_all(border_width);
smgraphsbselected->set_border_color_all(Color(accent_color.r, accent_color.g, accent_color.b, 0.9)); smgraphsbselected->set_border_color(Color(accent_color.r, accent_color.g, accent_color.b, 0.9));
smgraphsbselected->set_shadow_size(8 * EDSCALE); smgraphsbselected->set_shadow_size(8 * EDSCALE);
smgraphsbselected->set_shadow_color(shadow_color); smgraphsbselected->set_shadow_color(shadow_color);

2
editor/plugins/animation_blend_tree_editor_plugin.cpp
View file

@ -240,7 +240,7 @@ void AnimationNodeBlendTreeEditor::_update_graph() {
if (EditorSettings::get_singleton()->get("interface/theme/use_graph_node_headers")) { if (EditorSettings::get_singleton()->get("interface/theme/use_graph_node_headers")) {
Ref<StyleBoxFlat> sb = node->get_stylebox("frame", "GraphNode"); Ref<StyleBoxFlat> sb = node->get_stylebox("frame", "GraphNode");
Color c = sb->get_border_color(MARGIN_TOP); Color c = sb->get_border_color();
Color mono_color = ((c.r + c.g + c.b) / 3) < 0.7 ? Color(1.0, 1.0, 1.0) : Color(0.0, 0.0, 0.0); Color mono_color = ((c.r + c.g + c.b) / 3) < 0.7 ? Color(1.0, 1.0, 1.0) : Color(0.0, 0.0, 0.0);
mono_color.a = 0.85; mono_color.a = 0.85;
c = mono_color; c = mono_color;

2
editor/plugins/visual_shader_editor_plugin.cpp
View file

@ -344,7 +344,7 @@ void VisualShaderEditor::_update_graph() {
if (EditorSettings::get_singleton()->get("interface/theme/use_graph_node_headers")) { if (EditorSettings::get_singleton()->get("interface/theme/use_graph_node_headers")) {
Ref<StyleBoxFlat> sb = node->get_stylebox("frame", "GraphNode"); Ref<StyleBoxFlat> sb = node->get_stylebox("frame", "GraphNode");
Color c = sb->get_border_color(MARGIN_TOP); Color c = sb->get_border_color();
Color mono_color = ((c.r + c.g + c.b) / 3) < 0.7 ? Color(1.0, 1.0, 1.0) : Color(0.0, 0.0, 0.0); Color mono_color = ((c.r + c.g + c.b) / 3) < 0.7 ? Color(1.0, 1.0, 1.0) : Color(0.0, 0.0, 0.0);
mono_color.a = 0.85; mono_color.a = 0.85;
c = mono_color; c = mono_color;

6
modules/visual_script/visual_script_editor.cpp
View file

@ -579,7 +579,7 @@ void VisualScriptEditor::_update_graph(int p_only_id) {
if (gnode->is_comment()) if (gnode->is_comment())
sbf = EditorNode::get_singleton()->get_theme_base()->get_theme()->get_stylebox("comment", "GraphNode"); sbf = EditorNode::get_singleton()->get_theme_base()->get_theme()->get_stylebox("comment", "GraphNode");
Color c = sbf->get_border_color(MARGIN_TOP); Color c = sbf->get_border_color();
c.a = 1; c.a = 1;
if (EditorSettings::get_singleton()->get("interface/theme/use_graph_node_headers")) { if (EditorSettings::get_singleton()->get("interface/theme/use_graph_node_headers")) {
Color mono_color = ((c.r + c.g + c.b) / 3) < 0.7 ? Color(1.0, 1.0, 1.0) : Color(0.0, 0.0, 0.0); Color mono_color = ((c.r + c.g + c.b) / 3) < 0.7 ? Color(1.0, 1.0, 1.0) : Color(0.0, 0.0, 0.0);
@ -3054,10 +3054,10 @@ void VisualScriptEditor::_notification(int p_what) {
Ref<StyleBoxFlat> sb = tm->get_stylebox("frame", "GraphNode"); Ref<StyleBoxFlat> sb = tm->get_stylebox("frame", "GraphNode");
if (!sb.is_null()) { if (!sb.is_null()) {
Ref<StyleBoxFlat> frame_style = sb->duplicate(); Ref<StyleBoxFlat> frame_style = sb->duplicate();
Color c = sb->get_border_color(MARGIN_TOP); Color c = sb->get_border_color();
Color cn = E->get().second; Color cn = E->get().second;
cn.a = c.a; cn.a = c.a;
frame_style->set_border_color_all(cn); frame_style->set_border_color(cn);
node_styles[E->get().first] = frame_style; node_styles[E->get().first] = frame_style;
} }
} }

144
scene/resources/style_box.cpp
View file

@ -368,25 +368,14 @@ Color StyleBoxFlat::get_bg_color() const {
return bg_color; return bg_color;
} }
void StyleBoxFlat::set_border_color_all(const Color &p_color) { void StyleBoxFlat::set_border_color(const Color &p_color) {
for (int i = 0; i < 4; i++) {
border_color.write()[i] = p_color; border_color = p_color;
}
emit_changed(); emit_changed();
} }
Color StyleBoxFlat::get_border_color_all() const { Color StyleBoxFlat::get_border_color() const {
return border_color[MARGIN_TOP]; return border_color;
}
void StyleBoxFlat::set_border_color(Margin p_border, const Color &p_color) {
border_color.write()[p_border] = p_color;
emit_changed();
}
Color StyleBoxFlat::get_border_color(Margin p_border) const {
return border_color[p_border];
} }
void StyleBoxFlat::set_border_width_all(int p_size) { void StyleBoxFlat::set_border_width_all(int p_size) {
@ -562,7 +551,7 @@ inline void set_inner_corner_radius(const Rect2 style_rect, const Rect2 inner_re
inner_corner_radius[0] = MAX(corner_radius[0] - rad, 0); inner_corner_radius[0] = MAX(corner_radius[0] - rad, 0);
//tr //tr
rad = MIN(border_top, border_bottom); rad = MIN(border_top, border_right);
inner_corner_radius[1] = MAX(corner_radius[1] - rad, 0); inner_corner_radius[1] = MAX(corner_radius[1] - rad, 0);
//br //br
@ -575,7 +564,7 @@ inline void set_inner_corner_radius(const Rect2 style_rect, const Rect2 inner_re
} }
inline void draw_ring(Vector<Vector2> &verts, Vector<int> &indices, Vector<Color> &colors, const Rect2 style_rect, const int corner_radius[4], inline void draw_ring(Vector<Vector2> &verts, Vector<int> &indices, Vector<Color> &colors, const Rect2 style_rect, const int corner_radius[4],
const Rect2 ring_rect, const int border_width[4], const Color inner_color[4], const Color outer_color[4], const int corner_detail, const bool fill_center = false) { const Rect2 ring_rect, const int border_width[4], const Color &inner_color, const Color &outer_color, const int corner_detail, const bool fill_center = false) {
int vert_offset = verts.size(); int vert_offset = verts.size();
if (!vert_offset) { if (!vert_offset) {
@ -615,11 +604,11 @@ inline void draw_ring(Vector<Vector2> &verts, Vector<int> &indices, Vector<Color
Point2 corner_point; Point2 corner_point;
if (inner_outer == 0) { if (inner_outer == 0) {
radius = inner_corner_radius[corner_index]; radius = inner_corner_radius[corner_index];
color = *inner_color; color = inner_color;
corner_point = inner_points[corner_index]; corner_point = inner_points[corner_index];
} else { } else {
radius = ring_corner_radius[corner_index]; radius = ring_corner_radius[corner_index];
color = *outer_color; color = outer_color;
corner_point = outer_points[corner_index]; corner_point = outer_points[corner_index];
} }
float x = radius * (float)cos((double)corner_index * Math_PI / 2.0 + (double)detail / (double)adapted_corner_detail * Math_PI / 2.0 + Math_PI) + corner_point.x; float x = radius * (float)cos((double)corner_index * Math_PI / 2.0 + (double)detail / (double)adapted_corner_detail * Math_PI / 2.0 + Math_PI) + corner_point.x;
@ -630,27 +619,27 @@ inline void draw_ring(Vector<Vector2> &verts, Vector<int> &indices, Vector<Color
} }
} }
int vert_count = verts.size() - vert_offset; int ring_vert_count = verts.size() - vert_offset;
//fill the indices and the colors for the border //fill the indices and the colors for the border
for (int i = 0; i < vert_count; i++) { for (int i = 0; i < ring_vert_count; i++) {
indices.push_back(vert_offset + ((i + 0) % vert_count)); indices.push_back(vert_offset + ((i + 0) % ring_vert_count));
indices.push_back(vert_offset + ((i + 2) % vert_count)); indices.push_back(vert_offset + ((i + 2) % ring_vert_count));
indices.push_back(vert_offset + ((i + 1) % vert_count)); indices.push_back(vert_offset + ((i + 1) % ring_vert_count));
} }
if (fill_center) { if (fill_center) {
//fill the indices and the colors for the center //fill the indices and the colors for the center
for (int index = 0; index < vert_count / 2; index += 2) { for (int index = 0; index < ring_vert_count / 2; index += 2) {
int i = index; int i = index;
//poly 1 //poly 1
indices.push_back(vert_offset + i); indices.push_back(vert_offset + i);
indices.push_back(vert_offset + vert_count - 4 - i); indices.push_back(vert_offset + ring_vert_count - 4 - i);
indices.push_back(vert_offset + i + 2); indices.push_back(vert_offset + i + 2);
//poly 2 //poly 2
indices.push_back(vert_offset + i); indices.push_back(vert_offset + i);
indices.push_back(vert_offset + vert_count - 2 - i); indices.push_back(vert_offset + ring_vert_count - 2 - i);
indices.push_back(vert_offset + vert_count - 4 - i); indices.push_back(vert_offset + ring_vert_count - 4 - i);
} }
} }
} }
@ -684,9 +673,21 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
bool rounded_corners = (corner_radius[0] > 0) || (corner_radius[1] > 0) || (corner_radius[2] > 0) || (corner_radius[3] > 0); bool rounded_corners = (corner_radius[0] > 0) || (corner_radius[1] > 0) || (corner_radius[2] > 0) || (corner_radius[3] > 0);
bool aa_on = rounded_corners && anti_aliased; bool aa_on = rounded_corners && anti_aliased;
bool draw_border = (border_width[0] > 0) || (border_width[1] > 0) || (border_width[2] > 0) || (border_width[3] > 0);
Color border_color_alpha = Color(border_color.r, border_color.g, border_color.b, 0);
bool blend_on = blend_border && draw_border;
Rect2 style_rect = p_rect.grow_individual(expand_margin[MARGIN_LEFT], expand_margin[MARGIN_TOP], expand_margin[MARGIN_RIGHT], expand_margin[MARGIN_BOTTOM]); Rect2 style_rect = p_rect.grow_individual(expand_margin[MARGIN_LEFT], expand_margin[MARGIN_TOP], expand_margin[MARGIN_RIGHT], expand_margin[MARGIN_BOTTOM]);
if (aa_on) { Rect2 border_style_rect = style_rect;
style_rect = style_rect.grow(-((aa_size + 1) / 2)); if (aa_on && !blend_on) {
float aa_size_grow = 0.5 * ((aa_size + 1) / 2);
style_rect = style_rect.grow(-aa_size_grow);
for (int i = 0; i < 4; i++) {
if (border_width[i] > 0) {
border_style_rect = border_style_rect.grow_margin((Margin)i, -aa_size_grow);
}
}
} }
//adapt borders (prevent weird overlapping/glitchy drawings) //adapt borders (prevent weird overlapping/glitchy drawings)
@ -722,63 +723,78 @@ void StyleBoxFlat::draw(RID p_canvas_item, const Rect2 &p_rect) const {
Rect2 shadow_rect = style_rect.grow(shadow_size); Rect2 shadow_rect = style_rect.grow(shadow_size);
shadow_rect.position += shadow_offset; shadow_rect.position += shadow_offset;
Color shadow_colors[4] = { shadow_color, shadow_color, shadow_color, shadow_color }; Color shadow_color_transparent = Color(shadow_color.r, shadow_color.g, shadow_color.b, 0);
Color shadow_colors_transparent[4];
for (int i = 0; i < 4; i++) {
shadow_colors_transparent[i] = Color(shadow_color.r, shadow_color.g, shadow_color.b, 0);
}
draw_ring(verts, indices, colors, shadow_inner_rect, adapted_corner, draw_ring(verts, indices, colors, shadow_inner_rect, adapted_corner,
shadow_rect, shadow_width, shadow_colors, shadow_colors_transparent, corner_detail); shadow_rect, shadow_width, shadow_color, shadow_color_transparent, corner_detail);
if (draw_center) { if (draw_center) {
int no_border[4] = { 0, 0, 0, 0 }; int no_border[4] = { 0, 0, 0, 0 };
draw_ring(verts, indices, colors, shadow_inner_rect, adapted_corner, draw_ring(verts, indices, colors, shadow_inner_rect, adapted_corner,
shadow_inner_rect, no_border, shadow_colors, shadow_colors, corner_detail, true); shadow_inner_rect, no_border, shadow_color, shadow_color, corner_detail, true);
} }
} }
//DRAW border //DRAW border
Color bg_color_array[4] = { bg_color, bg_color, bg_color, bg_color }; if (draw_border) {
const Color *inner_color = ((blend_border) ? bg_color_array : border_color.read().ptr()); draw_ring(verts, indices, colors, border_style_rect, adapted_corner,
draw_ring(verts, indices, colors, style_rect, adapted_corner, border_style_rect, adapted_border, blend_on ? (draw_center ? bg_color : border_color_alpha) : border_color, border_color, corner_detail);
style_rect, adapted_border, inner_color, border_color.read().ptr(), corner_detail); }
//DRAW INFILL //DRAW INFILL
if (draw_center) { if (draw_center) {
int no_border[4] = { 0, 0, 0, 0 }; int no_border[4] = { 0, 0, 0, 0 };
draw_ring(verts, indices, colors, style_rect, adapted_corner, draw_ring(verts, indices, colors, style_rect, adapted_corner,
infill_rect, no_border, &bg_color, &bg_color, corner_detail, true); infill_rect, no_border, bg_color, bg_color, corner_detail, true);
} }
if (aa_on) { if (aa_on) {
Rect2 border_inner_rect = infill_rect;
//HELPER ARRAYS int aa_border_width[4];
Color border_color_alpha[4]; int aa_fill_width[4];
if (draw_border) {
border_inner_rect = border_style_rect.grow_individual(-adapted_border[MARGIN_LEFT], -adapted_border[MARGIN_TOP], -adapted_border[MARGIN_RIGHT], -adapted_border[MARGIN_BOTTOM]);
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
Color c = border_color.read().ptr()[i]; if (border_width[i] > 0) {
border_color_alpha[i] = Color(c.r, c.g, c.b, 0); aa_border_width[i] = aa_size;
aa_fill_width[i] = 0;
} else {
aa_border_width[i] = 0;
aa_fill_width[i] = aa_size;
}
}
} else {
for (int i = 0; i < 4; i++) {
aa_fill_width[i] = aa_size;
}
} }
Color alpha_bg = Color(bg_color.r, bg_color.g, bg_color.b, 0);
Color bg_color_array_alpha[4] = { alpha_bg, alpha_bg, alpha_bg, alpha_bg };
int aa_border_width[4] = { aa_size, aa_size, aa_size, aa_size };
if (draw_center) { if (draw_center) {
if (!blend_border) { if (!draw_border || !blend_on) {
Rect2 aa_rect = infill_rect.grow_individual(aa_fill_width[MARGIN_LEFT], aa_fill_width[MARGIN_TOP],
aa_fill_width[MARGIN_RIGHT], aa_fill_width[MARGIN_BOTTOM]);
Color alpha_bg = Color(bg_color.r, bg_color.g, bg_color.b, 0);
//INFILL AA //INFILL AA
draw_ring(verts, indices, colors, style_rect, adapted_corner, draw_ring(verts, indices, colors, style_rect, adapted_corner,
infill_rect.grow(aa_size), aa_border_width, bg_color_array, bg_color_array_alpha, corner_detail); aa_rect, aa_fill_width, bg_color, alpha_bg, corner_detail);
} }
} else if (!(border_width[0] == 0 && border_width[1] == 0 && border_width[2] == 0 && border_width[3] == 0)) { }
if (draw_border) {
if (!blend_on) {
//DRAW INNER BORDER AA //DRAW INNER BORDER AA
draw_ring(verts, indices, colors, style_rect, adapted_corner, draw_ring(verts, indices, colors, border_style_rect, adapted_corner,
infill_rect, aa_border_width, border_color_alpha, border_color.read().ptr(), corner_detail); border_inner_rect, aa_border_width, border_color_alpha, border_color, corner_detail);
} }
Rect2 aa_rect = border_style_rect.grow_individual(aa_border_width[MARGIN_LEFT], aa_border_width[MARGIN_TOP],
aa_border_width[MARGIN_RIGHT], aa_border_width[MARGIN_BOTTOM]);
//DRAW OUTER BORDER AA //DRAW OUTER BORDER AA
if (!(border_width[0] == 0 && border_width[1] == 0 && border_width[2] == 0 && border_width[3] == 0)) { draw_ring(verts, indices, colors, border_style_rect, adapted_corner,
draw_ring(verts, indices, colors, style_rect, adapted_corner, aa_rect, aa_border_width, border_color, border_color_alpha, corner_detail);
style_rect.grow(aa_size), aa_border_width, border_color.read().ptr(), border_color_alpha, corner_detail);
} }
} }
@ -793,8 +809,8 @@ void StyleBoxFlat::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_bg_color", "color"), &StyleBoxFlat::set_bg_color); ClassDB::bind_method(D_METHOD("set_bg_color", "color"), &StyleBoxFlat::set_bg_color);
ClassDB::bind_method(D_METHOD("get_bg_color"), &StyleBoxFlat::get_bg_color); ClassDB::bind_method(D_METHOD("get_bg_color"), &StyleBoxFlat::get_bg_color);
ClassDB::bind_method(D_METHOD("set_border_color", "color"), &StyleBoxFlat::set_border_color_all); ClassDB::bind_method(D_METHOD("set_border_color", "color"), &StyleBoxFlat::set_border_color);
ClassDB::bind_method(D_METHOD("get_border_color"), &StyleBoxFlat::get_border_color_all); ClassDB::bind_method(D_METHOD("get_border_color"), &StyleBoxFlat::get_border_color);
ClassDB::bind_method(D_METHOD("set_border_width_all", "width"), &StyleBoxFlat::set_border_width_all); ClassDB::bind_method(D_METHOD("set_border_width_all", "width"), &StyleBoxFlat::set_border_width_all);
ClassDB::bind_method(D_METHOD("get_border_width_min"), &StyleBoxFlat::get_border_width_min); ClassDB::bind_method(D_METHOD("get_border_width_min"), &StyleBoxFlat::get_border_width_min);
@ -880,11 +896,7 @@ StyleBoxFlat::StyleBoxFlat() {
bg_color = Color(0.6, 0.6, 0.6); bg_color = Color(0.6, 0.6, 0.6);
shadow_color = Color(0, 0, 0, 0.6); shadow_color = Color(0, 0, 0, 0.6);
border_color = Color(0.8, 0.8, 0.8);
border_color.append(Color(0.8, 0.8, 0.8));
border_color.append(Color(0.8, 0.8, 0.8));
border_color.append(Color(0.8, 0.8, 0.8));
border_color.append(Color(0.8, 0.8, 0.8));
blend_border = false; blend_border = false;
draw_center = true; draw_center = true;

8
scene/resources/style_box.h
View file

@ -149,7 +149,7 @@ class StyleBoxFlat : public StyleBox {
Color bg_color; Color bg_color;
Color shadow_color; Color shadow_color;
PoolVector<Color> border_color; Color border_color;
int border_width[4]; int border_width[4];
int expand_margin[4]; int expand_margin[4];
@ -174,10 +174,8 @@ public:
Color get_bg_color() const; Color get_bg_color() const;
//Border Color //Border Color
void set_border_color_all(const Color &p_color); void set_border_color(const Color &p_color);
Color get_border_color_all() const; Color get_border_color() const;
void set_border_color(Margin p_border, const Color &p_color);
Color get_border_color(Margin p_border) const;
//BORDER //BORDER
//width //width