godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Fix uniform title color in visual shaders(regression)

Browse Source
This commit is contained in:
Chaosus
2019-04-26 10:53:40 +03:00
parent 9ef46996cd
commit 7a9735eef4
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
editor/plugins/visual_shader_editor_plugin.cpp
View File

@@ -310,6 +310,21 @@ static Ref<StyleBoxEmpty> make_empty_stylebox(float p_margin_left = -1, float p_
return style; return style;
} }
void VisualShaderEditor::_update_created_node(GraphNode *node) {
if (EditorSettings::get_singleton()->get("interface/theme/use_graph_node_headers")) {
Ref<StyleBoxFlat> sb = node->get_stylebox("frame", "GraphNode");
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);
mono_color.a = 0.85;
c = mono_color;
node->add_color_override("title_color", c);
c.a = 0.7;
node->add_color_override("close_color", c);
}
}
void VisualShaderEditor::_update_graph() { void VisualShaderEditor::_update_graph() {
if (updating) if (updating)
@@ -374,6 +389,7 @@ void VisualShaderEditor::_update_graph() {
Ref<VisualShaderNodeUniform> uniform = vsnode; Ref<VisualShaderNodeUniform> uniform = vsnode;
if (uniform.is_valid()) { if (uniform.is_valid()) {
graph->add_child(node); graph->add_child(node);
_update_created_node(node);
LineEdit *uniform_name = memnew(LineEdit); LineEdit *uniform_name = memnew(LineEdit);
uniform_name->set_text(uniform->get_uniform_name()); uniform_name->set_text(uniform->get_uniform_name());
@@ -529,18 +545,7 @@ void VisualShaderEditor::_update_graph() {
if (!uniform.is_valid()) { if (!uniform.is_valid()) {
graph->add_child(node); graph->add_child(node);
} _update_created_node(node);
if (EditorSettings::get_singleton()->get("interface/theme/use_graph_node_headers")) {
Ref<StyleBoxFlat> sb = node->get_stylebox("frame", "GraphNode");
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);
mono_color.a = 0.85;
c = mono_color;
node->add_color_override("title_color", c);
c.a = 0.7;
node->add_color_override("close_color", c);
} }
} }

1
editor/plugins/visual_shader_editor_plugin.h
View File

@@ -179,6 +179,7 @@ class VisualShaderEditor : public VBoxContainer {
void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
bool _is_available(int p_flags); bool _is_available(int p_flags);
void _update_created_node(GraphNode *node);
protected: protected:
void _notification(int p_what); void _notification(int p_what);