godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't hide/show top editor if they did not change, fixes #26644

Browse Source
This commit is contained in:
Juan Linietsky 2019-03-06 12:42:01 -03:00
parent 5f079e2ef9
commit 6eac688952
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/editor_node.cpp
View File

@ -1454,9 +1454,21 @@ void EditorNode::edit_item(Object *p_object) {
} }
if (!sub_plugins.empty()) { if (!sub_plugins.empty()) {
_display_top_editors(false);
bool same = true;
if (sub_plugins.size() == editor_plugins_over->get_plugins_list().size()) {
for (int i = 0; i < sub_plugins.size(); i++) {
if (sub_plugins[i] != editor_plugins_over->get_plugins_list()[i]) {
same = false;
}
}
} else {
same = false;
}
if (!same) {
_display_top_editors(false);
_set_top_editors(sub_plugins); _set_top_editors(sub_plugins);
}
_set_editing_top_editors(p_object); _set_editing_top_editors(p_object);
_display_top_editors(true); _display_top_editors(true);
} else { } else {

4
editor/plugins/shader_editor_plugin.cpp
View File

@ -355,8 +355,8 @@ void ShaderEditor::_menu_option(int p_option) {
void ShaderEditor::_notification(int p_what) { void ShaderEditor::_notification(int p_what) {
if (p_what == NOTIFICATION_VISIBILITY_CHANGED) { if (p_what == NOTIFICATION_VISIBILITY_CHANGED) {
if (is_visible_in_tree()) //if (is_visible_in_tree())
shader_editor->get_text_edit()->grab_focus(); // shader_editor->get_text_edit()->grab_focus();
} }
} }