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

Improve guessing of what editor to switch to, fixes #10405

Browse source
This commit is contained in:
Juan Linietsky 2017-09-04 18:00:09 -03:00
parent 6960f8a3b8
commit 334a81844e
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editor/editor_node.cpp
View file

@ -2732,6 +2732,14 @@ Dictionary EditorNode::_get_main_scene_state() {
state["property_edit_offset"] = get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_value(); state["property_edit_offset"] = get_property_editor()->get_scene_tree()->get_vscroll_bar()->get_value();
state["saved_version"] = saved_version; state["saved_version"] = saved_version;
state["node_filter"] = scene_tree_dock->get_filter(); state["node_filter"] = scene_tree_dock->get_filter();
int current = -1;
for (int i = 0; i < editor_table.size(); i++) {
if (editor_plugin_screen == editor_table[i]) {
current = i;
break;
}
}
state["editor_index"] = current;
return state; return state;
} }
@ -2742,8 +2750,9 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) {
changing_scene = false; changing_scene = false;
if (get_edited_scene()) { if (p_state.has("editor_index")) {
int index = p_state["editor_index"];
int current = -1; int current = -1;
for (int i = 0; i < editor_table.size(); i++) { for (int i = 0; i < editor_table.size(); i++) {
if (editor_plugin_screen == editor_table[i]) { if (editor_plugin_screen == editor_table[i]) {
@ -2752,9 +2761,11 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) {
} }
} }
if (current < 2) { if (current < 2) { //if currently in spatial/2d, only switch to spatial/2d. if curently in script, stay there
if (index < 2 || !get_edited_scene()) {
_editor_select(index);
} else {
//use heuristic instead //use heuristic instead
int n2d = 0, n3d = 0; int n2d = 0, n3d = 0;
_find_node_types(get_edited_scene(), n2d, n3d); _find_node_types(get_edited_scene(), n2d, n3d);
if (n2d > n3d) { if (n2d > n3d) {
@ -2764,6 +2775,7 @@ void EditorNode::_set_main_scene_state(Dictionary p_state, Node *p_for_scene) {
} }
} }
} }
}
if (p_state.has("scene_tree_offset")) if (p_state.has("scene_tree_offset"))
scene_tree_dock->get_tree_editor()->get_scene_tree()->get_vscroll_bar()->set_value(p_state["scene_tree_offset"]); scene_tree_dock->get_tree_editor()->get_scene_tree()->get_vscroll_bar()->set_value(p_state["scene_tree_offset"]);