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

Fix ScriptEditor don't saving the layout when opening a help page

Browse source 
- Use ScriptEditor::_update_script_names just once when re-creating the layout
This commit is contained in:
Franklin Sobrinho 2016-07-18 12:30:43 -03:00
parent c328693e83
commit 3ca6e584e5
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tools/editor/plugins/script_editor_plugin.cpp
View file

@ -819,7 +819,7 @@ void ScriptEditor::_close_tab(int p_idx) {
_update_script_names(); _update_script_names();
EditorNode::get_singleton()->save_layout(); _save_layout();
} }
void ScriptEditor::_close_current_tab() { void ScriptEditor::_close_current_tab() {
@ -2057,6 +2057,9 @@ void ScriptEditor::_update_script_colors() {
void ScriptEditor::_update_script_names() { void ScriptEditor::_update_script_names() {
if (restoring_layout)
return;
waiting_update_names=false; waiting_update_names=false;
Set<Ref<Script> > used; Set<Ref<Script> > used;
Node* edited = EditorNode::get_singleton()->get_edited_scene(); Node* edited = EditorNode::get_singleton()->get_edited_scene();
@ -2220,10 +2223,8 @@ void ScriptEditor::edit(const Ref<Script>& p_script) {
_update_script_names(); _update_script_names();
_save_layout();
ste->connect("name_changed",this,"_update_script_names"); ste->connect("name_changed",this,"_update_script_names");
if (!restoring_layout) {
EditorNode::get_singleton()->save_layout();
}
//test for modification, maybe the script was not edited but was loaded //test for modification, maybe the script was not edited but was loaded
@ -2343,6 +2344,15 @@ void ScriptEditor::_add_callback(Object *p_obj, const String& p_function, const
} }
void ScriptEditor::_save_layout() {
if (restoring_layout) {
return;
}
editor->save_layout();
}
void ScriptEditor::_editor_settings_changed() { void ScriptEditor::_editor_settings_changed() {
trim_trailing_whitespace_on_save = EditorSettings::get_singleton()->get("text_editor/trim_trailing_whitespace_on_save"); trim_trailing_whitespace_on_save = EditorSettings::get_singleton()->get("text_editor/trim_trailing_whitespace_on_save");
@ -2400,7 +2410,7 @@ void ScriptEditor::_tree_changed() {
void ScriptEditor::_script_split_dragged(float) { void ScriptEditor::_script_split_dragged(float) {
EditorNode::get_singleton()->save_layout(); _save_layout();
} }
void ScriptEditor::_unhandled_input(const InputEvent& p_event) { void ScriptEditor::_unhandled_input(const InputEvent& p_event) {
@ -2446,7 +2456,6 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
} }
} }
for(int i=0;i<helps.size();i++) { for(int i=0;i<helps.size();i++) {
String path = helps[i]; String path = helps[i];
@ -2462,9 +2471,9 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
script_split->set_split_offset(p_layout->get_value("ScriptEditor","split_offset")); script_split->set_split_offset(p_layout->get_value("ScriptEditor","split_offset"));
} }
restoring_layout=false; restoring_layout=false;
_update_script_names();
} }
void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) { void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) {
@ -2524,7 +2533,7 @@ void ScriptEditor::_help_class_open(const String& p_class) {
eh->go_to_class(p_class,0); eh->go_to_class(p_class,0);
eh->connect("go_to_help",this,"_help_class_goto"); eh->connect("go_to_help",this,"_help_class_goto");
_update_script_names(); _update_script_names();
_save_layout();
} }
void ScriptEditor::_help_class_goto(const String& p_desc) { void ScriptEditor::_help_class_goto(const String& p_desc) {
@ -2553,7 +2562,7 @@ void ScriptEditor::_help_class_goto(const String& p_desc) {
eh->go_to_help(p_desc); eh->go_to_help(p_desc);
eh->connect("go_to_help",this,"_help_class_goto"); eh->connect("go_to_help",this,"_help_class_goto");
_update_script_names(); _update_script_names();
_save_layout();
} }
void ScriptEditor::_update_history_pos(int p_new_pos) { void ScriptEditor::_update_history_pos(int p_new_pos) {

1
tools/editor/plugins/script_editor_plugin.h
View file

@ -268,6 +268,7 @@ class ScriptEditor : public VBoxContainer {
void _update_window_menu(); void _update_window_menu();
void _script_created(Ref<Script> p_script); void _script_created(Ref<Script> p_script);
void _save_layout();
void _editor_settings_changed(); void _editor_settings_changed();
void _autosave_scripts(); void _autosave_scripts();