Browse Source

Merge pull request #386 from marynate/PR-scene-tree-align-eye-icon

Make visibility icon always last to display in scene tree
reduz 11 years ago
parent
commit
1024692041
1 changed files with 7 additions and 10 deletions
  1. 7 10
      tools/editor/scene_tree_editor.cpp

+ 7 - 10
tools/editor/scene_tree_editor.cpp

@@ -172,15 +172,6 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 
 		if (p_node->is_type("CanvasItem")) {
 
-			bool h = p_node->call("is_hidden");
-			if (h)
-				item->add_button(0,get_icon("Hidden","EditorIcons"),BUTTON_VISIBILITY);
-			else
-				item->add_button(0,get_icon("Visible","EditorIcons"),BUTTON_VISIBILITY);
-
-			if (!p_node->is_connected("visibility_changed",this,"_node_visibility_changed"))
-				p_node->connect("visibility_changed",this,"_node_visibility_changed",varray(p_node));
-
 			bool is_locked = p_node->has_meta("_edit_lock_");//_edit_group_
 			if (is_locked)
 				item->add_button(0,get_icon("Lock", "EditorIcons"), BUTTON_LOCK);
@@ -189,11 +180,17 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 			if (is_grouped)
 				item->add_button(0,get_icon("Group", "EditorIcons"), BUTTON_GROUP);
 
+			bool h = p_node->call("is_hidden");
+			if (h)
+				item->add_button(0,get_icon("Hidden","EditorIcons"),BUTTON_VISIBILITY);
+			else
+				item->add_button(0,get_icon("Visible","EditorIcons"),BUTTON_VISIBILITY);
 
+			if (!p_node->is_connected("visibility_changed",this,"_node_visibility_changed"))
+				p_node->connect("visibility_changed",this,"_node_visibility_changed",varray(p_node));
 
 		} else if (p_node->is_type("GeometryInstance")) {
 
-
 			bool h = !p_node->call("get_flag",VS::INSTANCE_FLAG_VISIBLE);
 			if (h)
 				item->add_button(0,get_icon("Hidden","EditorIcons"),BUTTON_VISIBILITY);