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

Adjust size of some dialogs

Browse Source
This commit is contained in:
kobewi 2023-04-10 17:04:47 +02:00
parent c48219f51e
commit 71011e0855
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/editor_node.cpp
View File

@ -1143,7 +1143,7 @@ void EditorNode::_scan_external_changes() {
} }
if (need_reload) { if (need_reload) {
disk_changed->call_deferred(SNAME("popup_centered_ratio"), 0.5); disk_changed->call_deferred(SNAME("popup_centered_ratio"), 0.3);
} }
} }
@ -3011,6 +3011,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
save_confirmation->set_ok_button_text(TTR("Save & Quit")); save_confirmation->set_ok_button_text(TTR("Save & Quit"));
save_confirmation->set_text(TTR("Save modified resources before closing?")); save_confirmation->set_text(TTR("Save modified resources before closing?"));
} }
save_confirmation->reset_size();
save_confirmation->popup_centered(); save_confirmation->popup_centered();
break; break;
} }
@ -3039,6 +3040,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
save_confirmation->set_ok_button_text(TTR("Save & Quit")); save_confirmation->set_ok_button_text(TTR("Save & Quit"));
save_confirmation->set_text((p_option == FILE_QUIT ? TTR("Save changes to the following scene(s) before quitting?") : TTR("Save changes to the following scene(s) before opening Project Manager?")) + unsaved_scenes); save_confirmation->set_text((p_option == FILE_QUIT ? TTR("Save changes to the following scene(s) before quitting?") : TTR("Save changes to the following scene(s) before opening Project Manager?")) + unsaved_scenes);
} }
save_confirmation->reset_size();
save_confirmation->popup_centered(); save_confirmation->popup_centered();
} }
@ -5471,6 +5473,7 @@ void EditorNode::_scene_tab_closed(int p_tab, int p_option) {
save_confirmation->set_ok_button_text(TTR("Save & Close")); save_confirmation->set_ok_button_text(TTR("Save & Close"));
save_confirmation->set_text(vformat(TTR("Save changes to '%s' before closing?"), !scene_filename.is_empty() ? scene_filename : "unsaved scene")); save_confirmation->set_text(vformat(TTR("Save changes to '%s' before closing?"), !scene_filename.is_empty() ? scene_filename : "unsaved scene"));
} }
save_confirmation->reset_size();
save_confirmation->popup_centered(); save_confirmation->popup_centered();
} else { } else {
_discard_changes(); _discard_changes();
@ -7770,6 +7773,7 @@ EditorNode::EditorNode() {
save_confirmation = memnew(ConfirmationDialog); save_confirmation = memnew(ConfirmationDialog);
save_confirmation->add_button(TTR("Don't Save"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard"); save_confirmation->add_button(TTR("Don't Save"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard");
gui_base->add_child(save_confirmation); gui_base->add_child(save_confirmation);
save_confirmation->set_min_size(Vector2(450.0 * EDSCALE, 0));
save_confirmation->connect("confirmed", callable_mp(this, &EditorNode::_menu_confirm_current)); save_confirmation->connect("confirmed", callable_mp(this, &EditorNode::_menu_confirm_current));
save_confirmation->connect("custom_action", callable_mp(this, &EditorNode::_discard_changes)); save_confirmation->connect("custom_action", callable_mp(this, &EditorNode::_discard_changes));

2
editor/plugins/script_editor_plugin.cpp
View File

@ -1060,7 +1060,7 @@ bool ScriptEditor::_test_script_times_on_disk(Ref<Resource> p_for_script) {
script_editor->reload_scripts(); script_editor->reload_scripts();
need_reload = false; need_reload = false;
} else { } else {
disk_changed->call_deferred(SNAME("popup_centered_ratio"), 0.5); disk_changed->call_deferred(SNAME("popup_centered_ratio"), 0.3);
} }
} }

4
editor/project_manager.cpp
View File

@ -2172,7 +2172,7 @@ void ProjectManager::_open_selected_projects_ask() {
return; return;
} }
const Size2i popup_min_size = Size2i(600.0 * EDSCALE, 400.0 * EDSCALE); const Size2i popup_min_size = Size2i(600.0 * EDSCALE, 0);
if (selected_list.size() > 1) { if (selected_list.size() > 1) {
multi_open_ask->set_text(vformat(TTR("You requested to open %d projects in parallel. Do you confirm?\nNote that usual checks for engine version compatibility will be bypassed."), selected_list.size())); multi_open_ask->set_text(vformat(TTR("You requested to open %d projects in parallel. Do you confirm?\nNote that usual checks for engine version compatibility will be bypassed."), selected_list.size()));
@ -2257,7 +2257,7 @@ void ProjectManager::_open_selected_projects_ask() {
void ProjectManager::_full_convert_button_pressed() { void ProjectManager::_full_convert_button_pressed() {
ask_update_settings->hide(); ask_update_settings->hide();
ask_full_convert_dialog->popup_centered(Size2i(600.0 * EDSCALE, 400.0 * EDSCALE)); ask_full_convert_dialog->popup_centered(Size2i(600.0 * EDSCALE, 0));
ask_full_convert_dialog->get_cancel_button()->grab_focus(); ask_full_convert_dialog->get_cancel_button()->grab_focus();
} }