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

Merge pull request #57565 from jmb462/split_offset

Browse source
This commit is contained in:
Rémi Verschelde 2022-02-03 17:04:49 +01:00 committed by GitHub
commit 3004415bfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
editor/plugins/script_editor_plugin.cpp
View file

@ -1603,7 +1603,8 @@ void ScriptEditor::_notification(int p_what) {
members_overview->connect("item_selected", callable_mp(this, &ScriptEditor::_members_overview_selected)); members_overview->connect("item_selected", callable_mp(this, &ScriptEditor::_members_overview_selected));
help_overview->connect("item_selected", callable_mp(this, &ScriptEditor::_help_overview_selected)); help_overview->connect("item_selected", callable_mp(this, &ScriptEditor::_help_overview_selected));
script_split->connect("dragged", callable_mp(this, &ScriptEditor::_script_split_dragged)); script_split->connect("dragged", callable_mp(this, &ScriptEditor::_split_dragged));
list_split->connect("dragged", callable_mp(this, &ScriptEditor::_split_dragged));
EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &ScriptEditor::_editor_settings_changed)); EditorSettings::get_singleton()->connect("settings_changed", callable_mp(this, &ScriptEditor::_editor_settings_changed));
EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &ScriptEditor::_filesystem_changed)); EditorFileSystem::get_singleton()->connect("filesystem_changed", callable_mp(this, &ScriptEditor::_filesystem_changed));
@ -2809,7 +2810,7 @@ void ScriptEditor::_tree_changed() {
call_deferred(SNAME("_update_script_connections")); call_deferred(SNAME("_update_script_connections"));
} }
void ScriptEditor::_script_split_dragged(float) { void ScriptEditor::_split_dragged(float) {
_save_layout(); _save_layout();
} }
@ -3199,8 +3200,12 @@ void ScriptEditor::set_window_layout(Ref<ConfigFile> p_layout) {
tab_container->get_child(i)->set_meta("__editor_pass", Variant()); tab_container->get_child(i)->set_meta("__editor_pass", Variant());
} }
if (p_layout->has_section_key("ScriptEditor", "split_offset")) { if (p_layout->has_section_key("ScriptEditor", "script_split_offset")) {
script_split->set_split_offset(p_layout->get_value("ScriptEditor", "split_offset")); script_split->set_split_offset(p_layout->get_value("ScriptEditor", "script_split_offset"));
}
if (p_layout->has_section_key("ScriptEditor", "list_split_offset")) {
list_split->set_split_offset(p_layout->get_value("ScriptEditor", "list_split_offset"));
} }
// Remove any deleted editors that have been removed between launches. // Remove any deleted editors that have been removed between launches.
@ -3253,7 +3258,8 @@ void ScriptEditor::get_window_layout(Ref<ConfigFile> p_layout) {
p_layout->set_value("ScriptEditor", "open_scripts", scripts); p_layout->set_value("ScriptEditor", "open_scripts", scripts);
p_layout->set_value("ScriptEditor", "open_help", helps); p_layout->set_value("ScriptEditor", "open_help", helps);
p_layout->set_value("ScriptEditor", "split_offset", script_split->get_split_offset()); p_layout->set_value("ScriptEditor", "script_split_offset", script_split->get_split_offset());
p_layout->set_value("ScriptEditor", "list_split_offset", list_split->get_split_offset());
// Save the cache. // Save the cache.
script_editor_cache->save(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("script_editor_cache.cfg")); script_editor_cache->save(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("script_editor_cache.cfg"));

2
editor/plugins/script_editor_plugin.h
View file

@ -418,7 +418,7 @@ class ScriptEditor : public PanelContainer {
void _tree_changed(); void _tree_changed();
void _script_split_dragged(float); void _split_dragged(float);
Variant get_drag_data_fw(const Point2 &p_point, Control *p_from); Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;