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

Make `fdialog_project` up to become sibling of `ProjectDialog` instead of child

This commit is contained in:
jsjtxietian 2024-07-19 20:57:16 +08:00
parent 383a6e4ef2
commit 092d21a2ec
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
editor/project_manager/project_dialog.cpp
View File

@ -389,6 +389,8 @@ void ProjectDialog::_browse_install_path() {
} }
void ProjectDialog::_project_path_selected(const String &p_path) { void ProjectDialog::_project_path_selected(const String &p_path) {
show_dialog();
if (create_dir->is_pressed() && (mode == MODE_NEW || mode == MODE_INSTALL)) { if (create_dir->is_pressed() && (mode == MODE_NEW || mode == MODE_INSTALL)) {
// Replace parent directory, but keep target dir name. // Replace parent directory, but keep target dir name.
project_path->set_text(p_path.path_join(project_path->get_text().get_file())); project_path->set_text(p_path.path_join(project_path->get_text().get_file()));
@ -686,8 +688,6 @@ void ProjectDialog::set_project_path(const String &p_path) {
} }
void ProjectDialog::ask_for_path_and_show() { void ProjectDialog::ask_for_path_and_show() {
// Workaround: for the file selection dialog content to be rendered we need to show its parent dialog.
show_dialog();
_browse_project_path(); _browse_project_path();
} }
@ -787,6 +787,14 @@ void ProjectDialog::_notification(int p_what) {
project_browse->set_icon(get_editor_theme_icon(SNAME("FolderBrowse"))); project_browse->set_icon(get_editor_theme_icon(SNAME("FolderBrowse")));
install_browse->set_icon(get_editor_theme_icon(SNAME("FolderBrowse"))); install_browse->set_icon(get_editor_theme_icon(SNAME("FolderBrowse")));
} break; } break;
case NOTIFICATION_READY: {
fdialog_project = memnew(EditorFileDialog);
fdialog_project->set_previews_enabled(false); // Crucial, otherwise the engine crashes.
fdialog_project->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
fdialog_project->connect("dir_selected", callable_mp(this, &ProjectDialog::_project_path_selected));
fdialog_project->connect("file_selected", callable_mp(this, &ProjectDialog::_project_path_selected));
callable_mp((Node *)this, &Node::add_sibling).call_deferred(fdialog_project, false);
} break;
} }
} }
@ -967,21 +975,14 @@ ProjectDialog::ProjectDialog() {
Control *spacer = memnew(Control); Control *spacer = memnew(Control);
spacer->set_h_size_flags(Control::SIZE_EXPAND_FILL); spacer->set_h_size_flags(Control::SIZE_EXPAND_FILL);
default_files_container->add_child(spacer); default_files_container->add_child(spacer);
fdialog_project = memnew(EditorFileDialog);
fdialog_project->set_previews_enabled(false); //Crucial, otherwise the engine crashes.
fdialog_project->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
fdialog_install = memnew(EditorFileDialog); fdialog_install = memnew(EditorFileDialog);
fdialog_install->set_previews_enabled(false); //Crucial, otherwise the engine crashes. fdialog_install->set_previews_enabled(false); //Crucial, otherwise the engine crashes.
fdialog_install->set_access(EditorFileDialog::ACCESS_FILESYSTEM); fdialog_install->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
add_child(fdialog_project);
add_child(fdialog_install); add_child(fdialog_install);
project_name->connect(SceneStringName(text_changed), callable_mp(this, &ProjectDialog::_project_name_changed).unbind(1)); project_name->connect(SceneStringName(text_changed), callable_mp(this, &ProjectDialog::_project_name_changed).unbind(1));
project_path->connect(SceneStringName(text_changed), callable_mp(this, &ProjectDialog::_project_path_changed).unbind(1)); project_path->connect(SceneStringName(text_changed), callable_mp(this, &ProjectDialog::_project_path_changed).unbind(1));
install_path->connect(SceneStringName(text_changed), callable_mp(this, &ProjectDialog::_install_path_changed).unbind(1)); install_path->connect(SceneStringName(text_changed), callable_mp(this, &ProjectDialog::_install_path_changed).unbind(1));
fdialog_project->connect("dir_selected", callable_mp(this, &ProjectDialog::_project_path_selected));
fdialog_project->connect("file_selected", callable_mp(this, &ProjectDialog::_project_path_selected));
fdialog_install->connect("dir_selected", callable_mp(this, &ProjectDialog::_install_path_selected)); fdialog_install->connect("dir_selected", callable_mp(this, &ProjectDialog::_install_path_selected));
fdialog_install->connect("file_selected", callable_mp(this, &ProjectDialog::_install_path_selected)); fdialog_install->connect("file_selected", callable_mp(this, &ProjectDialog::_install_path_selected));