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

Several ui improvements (mostly margins)

Browse Source 
Improved colors

Added some missing icons
This commit is contained in:
Daniel J. Ramirez
2017-08-07 21:55:24 -05:00
parent 9e938bf3c1
commit 273d2ab9d4
23 changed files with 187 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/scene_tree_editor.cpp
View File

@@ -185,19 +185,19 @@ bool SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) {
if (part_of_subscene) {
//item->set_selectable(0,marked_selectable);
item->set_custom_color(0, Color(0.8, 0.4, 0.20));
item->set_custom_color(0, get_color("error_color", "Editor").linear_interpolate(get_color("warning_color", "Editor"), 0.4));
} else if (marked.has(p_node)) {
item->set_selectable(0, marked_selectable);
item->set_custom_color(0, Color(0.8, 0.1, 0.10));
item->set_custom_color(0, get_color("error_color", "Editor"));
} else if (!marked_selectable && !marked_children_selectable) {
Node *node = p_node;
while (node) {
if (marked.has(node)) {
item->set_selectable(0, false);
item->set_custom_color(0, Color(0.8, 0.1, 0.10));
item->set_custom_color(0, get_color("error_color", "Editor"));
break;
}
node = node->get_parent();