diff --git a/editor/animation/animation_library_editor.cpp b/editor/animation/animation_library_editor.cpp index e37b465d88..fb0f7b0d9c 100644 --- a/editor/animation/animation_library_editor.cpp +++ b/editor/animation/animation_library_editor.cpp @@ -1024,6 +1024,7 @@ AnimationLibraryEditor::AnimationLibraryEditor() { add_child(vb); error_dialog = memnew(AcceptDialog); + error_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); error_dialog->set_title(TTRC("Error:")); add_child(error_dialog); } diff --git a/editor/animation/animation_player_editor_plugin.cpp b/editor/animation/animation_player_editor_plugin.cpp index a186955be7..3d737fa772 100644 --- a/editor/animation/animation_player_editor_plugin.cpp +++ b/editor/animation/animation_player_editor_plugin.cpp @@ -2129,6 +2129,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(AnimationPlayerEditorPlugin *p_plug scale->hide(); delete_dialog = memnew(ConfirmationDialog); + delete_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(delete_dialog); delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationPlayerEditor::_animation_remove_confirmed)); diff --git a/editor/animation/animation_track_editor.cpp b/editor/animation/animation_track_editor.cpp index 9ab07fe7e9..341d303cee 100644 --- a/editor/animation/animation_track_editor.cpp +++ b/editor/animation/animation_track_editor.cpp @@ -8704,6 +8704,7 @@ AnimationTrackEditor::AnimationTrackEditor() { track_copy_dialog->connect(SceneStringName(confirmed), callable_mp(this, &AnimationTrackEditor::_edit_menu_pressed).bind(EDIT_COPY_TRACKS_CONFIRM)); read_only_dialog = memnew(AcceptDialog); + read_only_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); read_only_dialog->set_title(TTRC("Key Insertion Error")); read_only_dialog->set_text(TTRC("Imported Animation cannot be edited!")); add_child(read_only_dialog); @@ -9781,6 +9782,7 @@ AnimationMarkerEdit::AnimationMarkerEdit() { marker_insert_color->get_popup()->connect("about_to_popup", callable_mp(EditorNode::get_singleton(), &EditorNode::setup_color_picker).bind(marker_insert_color->get_picker())); marker_insert_vbox->add_child(_create_hbox_labeled_control(TTRC("Marker Color"), marker_insert_color)); marker_insert_error_dialog = memnew(AcceptDialog); + marker_insert_error_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); marker_insert_error_dialog->set_ok_button_text(TTRC("Close")); marker_insert_error_dialog->set_title(TTRC("Error!")); marker_insert_confirm->add_child(marker_insert_error_dialog); @@ -9803,6 +9805,7 @@ AnimationMarkerEdit::AnimationMarkerEdit() { marker_rename_vbox->add_child(marker_rename_new_name); marker_rename_error_dialog = memnew(AcceptDialog); + marker_rename_error_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); marker_rename_error_dialog->set_ok_button_text(TTRC("Close")); marker_rename_error_dialog->set_title(TTRC("Error!")); marker_rename_confirm->add_child(marker_rename_error_dialog); diff --git a/editor/debugger/editor_debugger_tree.cpp b/editor/debugger/editor_debugger_tree.cpp index 08975c3b33..574ca4ff53 100644 --- a/editor/debugger/editor_debugger_tree.cpp +++ b/editor/debugger/editor_debugger_tree.cpp @@ -62,6 +62,7 @@ EditorDebuggerTree::EditorDebuggerTree() { add_child(file_dialog); accept = memnew(AcceptDialog); + accept->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(accept); } diff --git a/editor/docks/filesystem_dock.cpp b/editor/docks/filesystem_dock.cpp index 39545a696f..ed4ae44f1b 100644 --- a/editor/docks/filesystem_dock.cpp +++ b/editor/docks/filesystem_dock.cpp @@ -4573,6 +4573,7 @@ FileSystemDock::FileSystemDock() { new_resource_dialog->connect("create", callable_mp(this, &FileSystemDock::_resource_created)); conversion_dialog = memnew(ConfirmationDialog); + conversion_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(conversion_dialog); conversion_dialog->set_ok_button_text(TTRC("Convert")); conversion_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileSystemDock::_convert_dialog_action)); @@ -4591,6 +4592,7 @@ FileSystemDock::FileSystemDock() { vb->add_child(confirm_before_move_checkbox); unrecognized_ext_dialog = memnew(AcceptDialog); + unrecognized_ext_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(unrecognized_ext_dialog); unrecognized_ext_dialog->set_text(TTRC("This file extension is not recognized by the editor.\nIf you want to rename it anyway, use your operating system's file manager.\nAfter renaming to an unknown extension, the file won't be shown in the editor anymore.\nTo make the editor recognize this file extension, add it to one of the lists of extensions in Editor Settings > Docks > FileSystem.")); Button *settings_button = unrecognized_ext_dialog->add_button(TTRC("Open Editor Settings"), false, "open_editor_settings_docks_filesystem"); diff --git a/editor/docks/inspector_dock.cpp b/editor/docks/inspector_dock.cpp index a7fdaab5a3..2b7cc04ee3 100644 --- a/editor/docks/inspector_dock.cpp +++ b/editor/docks/inspector_dock.cpp @@ -848,6 +848,7 @@ InspectorDock::InspectorDock(EditorData &p_editor_data) { unique_resources_confirmation->connect(SceneStringName(confirmed), callable_mp(this, &InspectorDock::_menu_confirm_current)); info_dialog = memnew(AcceptDialog); + info_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); EditorNode::get_singleton()->get_gui_base()->add_child(info_dialog); load_resource_dialog = memnew(EditorFileDialog); diff --git a/editor/docks/scene_tree_dock.cpp b/editor/docks/scene_tree_dock.cpp index f2ceae29fe..8320b40f7a 100644 --- a/editor/docks/scene_tree_dock.cpp +++ b/editor/docks/scene_tree_dock.cpp @@ -5160,10 +5160,12 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec vb->add_child(delete_tracks_checkbox); editable_instance_remove_dialog = memnew(ConfirmationDialog); + editable_instance_remove_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(editable_instance_remove_dialog); editable_instance_remove_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_toggle_editable_children_from_selection)); placeholder_editable_instance_remove_dialog = memnew(ConfirmationDialog); + placeholder_editable_instance_remove_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(placeholder_editable_instance_remove_dialog); placeholder_editable_instance_remove_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SceneTreeDock::_toggle_placeholder_from_selection)); @@ -5188,6 +5190,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec menu_properties->connect(SceneStringName(id_pressed), callable_mp(this, &SceneTreeDock::_property_selected)); clear_inherit_confirm = memnew(ConfirmationDialog); + clear_inherit_confirm->set_flag(Window::FLAG_RESIZE_DISABLED, true); clear_inherit_confirm->set_text(TTR("Clear Inheritance? (No Undo!)")); clear_inherit_confirm->set_ok_button_text(TTR("Clear")); add_child(clear_inherit_confirm); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index b48f9f68c2..57045f0760 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -6566,6 +6566,7 @@ void EditorNode::_immediate_dialog_confirmed() { } bool EditorNode::immediate_confirmation_dialog(const String &p_text, const String &p_ok_text, const String &p_cancel_text, uint32_t p_wrap_width) { ConfirmationDialog *cd = memnew(ConfirmationDialog); + cd->set_flag(Window::FLAG_RESIZE_DISABLED, true); cd->set_text(p_text); cd->set_ok_button_text(p_ok_text); cd->set_cancel_button_text(p_cancel_text); @@ -9249,6 +9250,7 @@ EditorNode::EditorNode() { save_confirmation->connect("about_to_popup", callable_mp(this, &EditorNode::_prepare_save_confirmation_popup)); gradle_build_manage_templates = memnew(ConfirmationDialog); + gradle_build_manage_templates->set_flag(Window::FLAG_RESIZE_DISABLED, true); gradle_build_manage_templates->set_text(TTR("Android build template is missing, please install relevant templates.")); gradle_build_manage_templates->set_ok_button_text(TTR("Manage Templates")); gradle_build_manage_templates->add_button(TTR("Install from file"))->connect(SceneStringName(pressed), callable_mp(this, &EditorNode::_android_install_build_template)); @@ -9276,6 +9278,7 @@ EditorNode::EditorNode() { vbox->add_child(choose_android_export_profile); install_android_build_template = memnew(ConfirmationDialog); + install_android_build_template->set_flag(Window::FLAG_RESIZE_DISABLED, true); install_android_build_template->set_ok_button_text(TTR("Install")); install_android_build_template->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_menu_confirm_current)); install_android_build_template->add_child(vbox); @@ -9357,6 +9360,7 @@ EditorNode::EditorNode() { gui_base->add_child(disk_changed); project_data_missing = memnew(ConfirmationDialog); + project_data_missing->set_flag(Window::FLAG_RESIZE_DISABLED, true); project_data_missing->set_text(TTRC("Project data folder (.godot) is missing. Please restart editor.")); project_data_missing->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::restart_editor).bind(false)); project_data_missing->set_ok_button_text(TTRC("Restart")); @@ -9505,6 +9509,7 @@ EditorNode::EditorNode() { set_process(true); open_imported = memnew(ConfirmationDialog); + open_imported->set_flag(Window::FLAG_RESIZE_DISABLED, true); open_imported->set_ok_button_text(TTR("Open Anyway")); new_inherited_button = open_imported->add_button(TTR("New Inherited"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "inherit"); open_imported->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_open_imported)); diff --git a/editor/export/export_template_manager.cpp b/editor/export/export_template_manager.cpp index 66072abad7..c929b2b0c5 100644 --- a/editor/export/export_template_manager.cpp +++ b/editor/export/export_template_manager.cpp @@ -1667,6 +1667,7 @@ ExportTemplateManager::ExportTemplateManager() { enable_online_button->connect(SceneStringName(pressed), callable_mp(this, &ExportTemplateManager::_force_online_mode)); confirm_delete = memnew(ConfirmationDialog); + confirm_delete->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(confirm_delete); confirm_delete->connect(SceneStringName(confirmed), callable_mp(this, &ExportTemplateManager::_delete_confirmed)); diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index 3ce475bd9a..d77eafa89c 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -1968,6 +1968,7 @@ ProjectExportDialog::ProjectExportDialog() { export_button->set_disabled(true); export_all_dialog = memnew(ConfirmationDialog); + export_all_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(export_all_dialog); export_all_dialog->set_title(TTR("Export All")); export_all_dialog->set_text(TTR("Choose an export mode:")); diff --git a/editor/inspector/editor_properties.cpp b/editor/inspector/editor_properties.cpp index 692b94306b..2b0751d094 100644 --- a/editor/inspector/editor_properties.cpp +++ b/editor/inspector/editor_properties.cpp @@ -2468,6 +2468,7 @@ EditorPropertyQuaternion::EditorPropertyQuaternion() { warning->set_theme_type_variation(SNAME("EditorInspectorButton")); warning->connect(SceneStringName(pressed), callable_mp(this, &EditorPropertyQuaternion::_warning_pressed)); warning_dialog = memnew(AcceptDialog); + warning_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(warning_dialog); warning_dialog->set_text(TTR("Temporary Euler will not be stored in the object with the original value. Instead, it will be stored as Quaternion with irreversible conversion.\nThis is due to the fact that the result of Euler->Quaternion can be determined uniquely, but the result of Quaternion->Euler can be multi-existent.")); diff --git a/editor/project_manager/project_dialog.cpp b/editor/project_manager/project_dialog.cpp index 7c83dcc0cc..9b6a9f6912 100644 --- a/editor/project_manager/project_dialog.cpp +++ b/editor/project_manager/project_dialog.cpp @@ -547,6 +547,7 @@ void ProjectDialog::ok_pressed() { if (!is_folder_empty) { if (!nonempty_confirmation) { nonempty_confirmation = memnew(ConfirmationDialog); + nonempty_confirmation->set_flag(Window::FLAG_RESIZE_DISABLED, true); nonempty_confirmation->set_title(TTRC("Warning: This folder is not empty")); nonempty_confirmation->set_text(TTRC("You are about to create a Godot project in a non-empty folder.\nThe entire contents of this folder will be imported as project resources!\n\nAre you sure you wish to continue?")); nonempty_confirmation->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectDialog::_nonempty_confirmation_ok_pressed)); diff --git a/editor/project_manager/project_manager.cpp b/editor/project_manager/project_manager.cpp index cd1f3a5f3e..1619a2ba30 100644 --- a/editor/project_manager/project_manager.cpp +++ b/editor/project_manager/project_manager.cpp @@ -1778,6 +1778,7 @@ ProjectManager::ProjectManager() { scan_dir->connect("dir_selected", callable_mp(project_list, &ProjectList::find_projects)); erase_missing_ask = memnew(ConfirmationDialog); + erase_missing_ask->set_flag(Window::FLAG_RESIZE_DISABLED, true); erase_missing_ask->set_ok_button_text(TTRC("Remove All")); erase_missing_ask->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_erase_missing_projects_confirm)); add_child(erase_missing_ask); @@ -1801,11 +1802,13 @@ ProjectManager::ProjectManager() { //erase_ask_vb->add_child(delete_project_contents); multi_open_ask = memnew(ConfirmationDialog); + multi_open_ask->set_flag(Window::FLAG_RESIZE_DISABLED, true); multi_open_ask->set_ok_button_text(TTRC("Edit")); multi_open_ask->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_open_selected_projects)); add_child(multi_open_ask); multi_run_ask = memnew(ConfirmationDialog); + multi_run_ask->set_flag(Window::FLAG_RESIZE_DISABLED, true); multi_run_ask->set_ok_button_text(TTRC("Run")); multi_run_ask->get_ok_button()->connect(SceneStringName(pressed), callable_mp(this, &ProjectManager::_run_project_confirm)); add_child(multi_run_ask); diff --git a/editor/scene/2d/abstract_polygon_2d_editor.cpp b/editor/scene/2d/abstract_polygon_2d_editor.cpp index 3b6e79b584..85bedb758c 100644 --- a/editor/scene/2d/abstract_polygon_2d_editor.cpp +++ b/editor/scene/2d/abstract_polygon_2d_editor.cpp @@ -924,6 +924,7 @@ AbstractPolygon2DEditor::AbstractPolygon2DEditor(bool p_wip_destructive) { button_center->set_visible(edit_origin_and_center); create_resource = memnew(ConfirmationDialog); + create_resource->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(create_resource); create_resource->set_ok_button_text(TTR("Create")); } diff --git a/editor/scene/2d/path_2d_editor_plugin.cpp b/editor/scene/2d/path_2d_editor_plugin.cpp index dd894bff00..b35a8e9304 100644 --- a/editor/scene/2d/path_2d_editor_plugin.cpp +++ b/editor/scene/2d/path_2d_editor_plugin.cpp @@ -898,6 +898,7 @@ Path2DEditor::Path2DEditor() { toolbar->add_child(curve_clear_points); clear_points_dialog = memnew(ConfirmationDialog); + clear_points_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); clear_points_dialog->set_title(TTR("Please Confirm...")); clear_points_dialog->set_text(TTR("Remove all curve points?")); clear_points_dialog->connect(SceneStringName(confirmed), callable_mp(this, &Path2DEditor::_mode_selected).bind(MODE_CLEAR_POINTS)); diff --git a/editor/scene/2d/polygon_2d_editor_plugin.cpp b/editor/scene/2d/polygon_2d_editor_plugin.cpp index 6f6b7fab7b..b39f60a283 100644 --- a/editor/scene/2d/polygon_2d_editor_plugin.cpp +++ b/editor/scene/2d/polygon_2d_editor_plugin.cpp @@ -1570,6 +1570,7 @@ Polygon2DEditor::Polygon2DEditor() { canvas->set_focus_mode(FOCUS_CLICK); error = memnew(AcceptDialog); + error->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(error); } diff --git a/editor/scene/2d/skeleton_2d_editor_plugin.cpp b/editor/scene/2d/skeleton_2d_editor_plugin.cpp index 91b4bad222..d55b9c7d33 100644 --- a/editor/scene/2d/skeleton_2d_editor_plugin.cpp +++ b/editor/scene/2d/skeleton_2d_editor_plugin.cpp @@ -109,6 +109,7 @@ Skeleton2DEditor::Skeleton2DEditor() { options->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &Skeleton2DEditor::_menu_option)); err_dialog = memnew(AcceptDialog); + err_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(err_dialog); } diff --git a/editor/scene/2d/sprite_2d_editor_plugin.cpp b/editor/scene/2d/sprite_2d_editor_plugin.cpp index 5cc71fe6f9..ab4014bc97 100644 --- a/editor/scene/2d/sprite_2d_editor_plugin.cpp +++ b/editor/scene/2d/sprite_2d_editor_plugin.cpp @@ -652,6 +652,7 @@ Sprite2DEditor::Sprite2DEditor() { // Other elements definition err_dialog = memnew(AcceptDialog); + err_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(err_dialog); debug_uv_dialog = memnew(ConfirmationDialog); diff --git a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp index a80f2d21bf..94c148947c 100644 --- a/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp +++ b/editor/scene/2d/tiles/tile_set_atlas_source_editor.cpp @@ -2751,6 +2751,7 @@ TileSetAtlasSourceEditor::TileSetAtlasSourceEditor() { // -- Dialogs -- confirm_auto_create_tiles = memnew(AcceptDialog); + confirm_auto_create_tiles->set_flag(Window::FLAG_RESIZE_DISABLED, true); confirm_auto_create_tiles->set_title(TTRC("Auto Create Tiles in Non-Transparent Texture Regions?")); confirm_auto_create_tiles->set_text(TTRC("The atlas's texture was modified.\nWould you like to automatically create tiles in the atlas?")); confirm_auto_create_tiles->set_ok_button_text(TTRC("Yes")); diff --git a/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp b/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp index ab5e649fc7..e2d29beb6a 100644 --- a/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp +++ b/editor/scene/3d/mesh_instance_3d_editor_plugin.cpp @@ -903,6 +903,7 @@ MeshInstance3DEditor::MeshInstance3DEditor() { shape_dialog->connect(SceneStringName(confirmed), callable_mp(this, &MeshInstance3DEditor::_create_collision_shape)); err_dialog = memnew(AcceptDialog); + err_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(err_dialog); debug_uv_dialog = memnew(AcceptDialog); diff --git a/editor/scene/3d/multimesh_editor_plugin.cpp b/editor/scene/3d/multimesh_editor_plugin.cpp index f6b832cfdd..9335f1a2c1 100644 --- a/editor/scene/3d/multimesh_editor_plugin.cpp +++ b/editor/scene/3d/multimesh_editor_plugin.cpp @@ -374,6 +374,7 @@ MultiMeshEditor::MultiMeshEditor() { _last_pp_node = nullptr; err_dialog = memnew(AcceptDialog); + err_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(err_dialog); } diff --git a/editor/scene/3d/path_3d_editor_plugin.cpp b/editor/scene/3d/path_3d_editor_plugin.cpp index 654bf24baa..b1f82f948b 100644 --- a/editor/scene/3d/path_3d_editor_plugin.cpp +++ b/editor/scene/3d/path_3d_editor_plugin.cpp @@ -1086,6 +1086,7 @@ Path3DEditorPlugin::Path3DEditorPlugin() { toolbar->add_child(curve_clear_points); clear_points_dialog = memnew(ConfirmationDialog); + clear_points_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); clear_points_dialog->set_title(TTR("Please Confirm...")); clear_points_dialog->set_text(TTR("Remove all curve points?")); clear_points_dialog->connect(SceneStringName(confirmed), callable_mp(this, &Path3DEditorPlugin::_clear_points)); diff --git a/editor/scene/connections_dialog.cpp b/editor/scene/connections_dialog.cpp index 2f44d09b45..47cd4b9afe 100644 --- a/editor/scene/connections_dialog.cpp +++ b/editor/scene/connections_dialog.cpp @@ -957,6 +957,7 @@ ConnectDialog::ConnectDialog() { cdbinds = memnew(ConnectDialogBinds); error = memnew(AcceptDialog); + error->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(error); error->set_title(TTR("Cannot connect signal")); error->set_ok_button_text(TTR("Close")); @@ -1793,6 +1794,7 @@ ConnectionsDock::ConnectionsDock() { holder->add_child(connect_dialog); disconnect_all_dialog = memnew(ConfirmationDialog); + disconnect_all_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); holder->add_child(disconnect_all_dialog); disconnect_all_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ConnectionsDock::_disconnect_all)); disconnect_all_dialog->set_text(TTR("Are you sure you want to remove all connections from this signal?")); diff --git a/editor/scene/gui/theme_editor_plugin.cpp b/editor/scene/gui/theme_editor_plugin.cpp index 72d03ea498..9fd6e78d6e 100644 --- a/editor/scene/gui/theme_editor_plugin.cpp +++ b/editor/scene/gui/theme_editor_plugin.cpp @@ -2181,6 +2181,7 @@ ThemeItemEditorDialog::ThemeItemEditorDialog(ThemeTypeEditor *p_theme_type_edito import_other_theme_items->connect("items_imported", callable_mp(this, &ThemeItemEditorDialog::_update_edit_types)); confirm_closing_dialog = memnew(ConfirmationDialog); + confirm_closing_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); confirm_closing_dialog->set_autowrap(true); add_child(confirm_closing_dialog); confirm_closing_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ThemeItemEditorDialog::_close_dialog)); @@ -2328,6 +2329,7 @@ ThemeTypeDialog::ThemeTypeDialog() { add_type_options->connect("item_activated", callable_mp(this, &ThemeTypeDialog::_add_type_dialog_activated)); add_type_confirmation = memnew(ConfirmationDialog); + add_type_confirmation->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_type_confirmation->set_title(TTR("Type name is empty!")); add_type_confirmation->set_text(TTR("Are you sure you want to create an empty type?")); add_type_confirmation->connect(SceneStringName(confirmed), callable_mp(this, &ThemeTypeDialog::_add_type_confirmed)); diff --git a/editor/scene/resource_preloader_editor_plugin.cpp b/editor/scene/resource_preloader_editor_plugin.cpp index dda2c1d944..83c2577872 100644 --- a/editor/scene/resource_preloader_editor_plugin.cpp +++ b/editor/scene/resource_preloader_editor_plugin.cpp @@ -408,6 +408,7 @@ ResourcePreloaderEditor::ResourcePreloaderEditor() { mc->add_child(tree); dialog = memnew(AcceptDialog); + dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); dialog->set_title(TTRC("Error!")); dialog->set_ok_button_text(TTRC("Close")); add_child(dialog); diff --git a/editor/scene/sprite_frames_editor_plugin.cpp b/editor/scene/sprite_frames_editor_plugin.cpp index 48583e7bc8..1ae4afaacf 100644 --- a/editor/scene/sprite_frames_editor_plugin.cpp +++ b/editor/scene/sprite_frames_editor_plugin.cpp @@ -2459,6 +2459,7 @@ SpriteFramesEditor::SpriteFramesEditor() { sub_vb->add_child(frame_list); dialog = memnew(AcceptDialog); + dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(dialog); load->connect(SceneStringName(pressed), callable_mp(this, &SpriteFramesEditor::_load_pressed)); @@ -2509,6 +2510,7 @@ SpriteFramesEditor::SpriteFramesEditor() { edited_anim = SceneStringName(default_); delete_dialog = memnew(ConfirmationDialog); + delete_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(delete_dialog); delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SpriteFramesEditor::_animation_remove_confirmed)); diff --git a/editor/script/script_create_dialog.cpp b/editor/script/script_create_dialog.cpp index dec715171e..df52f09b21 100644 --- a/editor/script/script_create_dialog.cpp +++ b/editor/script/script_create_dialog.cpp @@ -1023,6 +1023,7 @@ ScriptCreateDialog::ScriptCreateDialog() { add_child(file_browse); set_ok_button_text(TTR("Create")); alert = memnew(AcceptDialog); + alert->set_flag(Window::FLAG_RESIZE_DISABLED, true); alert->get_label()->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART); alert->get_label()->set_horizontal_alignment(HORIZONTAL_ALIGNMENT_CENTER); alert->get_label()->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER); diff --git a/editor/script/script_editor_plugin.cpp b/editor/script/script_editor_plugin.cpp index 036e6a6860..f03726bb90 100644 --- a/editor/script/script_editor_plugin.cpp +++ b/editor/script/script_editor_plugin.cpp @@ -4091,6 +4091,7 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) { tab_container->connect("tab_changed", callable_mp(this, &ScriptEditor::_tab_changed)); erase_tab_confirm = memnew(ConfirmationDialog); + erase_tab_confirm->set_flag(Window::FLAG_RESIZE_DISABLED, true); erase_tab_confirm->set_ok_button_text(TTRC("Save")); erase_tab_confirm->add_button(TTRC("Discard"), DisplayServer::get_singleton()->get_swap_cancel_ok(), "discard"); erase_tab_confirm->connect(SceneStringName(confirmed), callable_mp(this, &ScriptEditor::_close_current_tab).bind(true, true)); diff --git a/editor/settings/editor_build_profile.cpp b/editor/settings/editor_build_profile.cpp index 10f549fbfe..820bb059e9 100644 --- a/editor/settings/editor_build_profile.cpp +++ b/editor/settings/editor_build_profile.cpp @@ -1429,6 +1429,7 @@ EditorBuildProfileManager::EditorBuildProfileManager() { main_vbc->add_margin_child(TTRC("Description:"), description_bit, false); confirm_dialog = memnew(ConfirmationDialog); + confirm_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(confirm_dialog); confirm_dialog->set_title(TTRC("Please Confirm:")); confirm_dialog->set_autowrap(true); diff --git a/editor/settings/editor_feature_profile.cpp b/editor/settings/editor_feature_profile.cpp index f7f2aabe33..4af4f26d3f 100644 --- a/editor/settings/editor_feature_profile.cpp +++ b/editor/settings/editor_feature_profile.cpp @@ -1060,6 +1060,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() { new_profile_dialog->set_ok_button_text(TTR("Create")); erase_profile_dialog = memnew(ConfirmationDialog); + erase_profile_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(erase_profile_dialog); erase_profile_dialog->set_title(TTR("Remove Profile")); erase_profile_dialog->connect(SceneStringName(confirmed), callable_mp(this, &EditorFeatureProfileManager::_erase_selected_profile)); diff --git a/editor/version_control/version_control_editor_plugin.cpp b/editor/version_control/version_control_editor_plugin.cpp index 59289c326a..c634f6b9d4 100644 --- a/editor/version_control/version_control_editor_plugin.cpp +++ b/editor/version_control/version_control_editor_plugin.cpp @@ -1244,6 +1244,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { unstage_title->add_child(refresh_button); discard_all_confirm = memnew(AcceptDialog); + discard_all_confirm->set_flag(Window::FLAG_RESIZE_DISABLED, true); discard_all_confirm->set_title(TTR("Discard all changes")); discard_all_confirm->set_min_size(Size2i(400, 50)); discard_all_confirm->set_text(TTR("This operation is IRREVERSIBLE. Your changes will be deleted FOREVER.")); @@ -1419,6 +1420,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { branch_create_ok->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_create_branch)); branch_remove_confirm = memnew(AcceptDialog); + branch_remove_confirm->set_flag(Window::FLAG_RESIZE_DISABLED, true); branch_remove_confirm->set_title(TTR("Remove Branch")); branch_remove_confirm->add_cancel_button(); version_commit_dock->add_child(branch_remove_confirm); @@ -1466,6 +1468,7 @@ VersionControlEditorPlugin::VersionControlEditorPlugin() { remote_create_ok->connect(SceneStringName(pressed), callable_mp(this, &VersionControlEditorPlugin::_create_remote)); remote_remove_confirm = memnew(AcceptDialog); + remote_remove_confirm->set_flag(Window::FLAG_RESIZE_DISABLED, true); remote_remove_confirm->set_title(TTR("Remove Remote")); remote_remove_confirm->add_cancel_button(); version_commit_dock->add_child(remote_remove_confirm); diff --git a/modules/csg/editor/csg_gizmos.cpp b/modules/csg/editor/csg_gizmos.cpp index db3f8b0f3b..8fc693180c 100644 --- a/modules/csg/editor/csg_gizmos.cpp +++ b/modules/csg/editor/csg_gizmos.cpp @@ -167,6 +167,7 @@ CSGShapeEditor::CSGShapeEditor() { options->get_popup()->connect(SceneStringName(id_pressed), callable_mp(this, &CSGShapeEditor::_menu_option)); err_dialog = memnew(AcceptDialog); + err_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(err_dialog); } diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp index 351bbdc6c4..13922d8f3a 100644 --- a/modules/multiplayer/editor/replication_editor.cpp +++ b/modules/multiplayer/editor/replication_editor.cpp @@ -166,6 +166,7 @@ ReplicationEditor::ReplicationEditor() { set_custom_minimum_size(Size2(0, 200) * EDSCALE); delete_dialog = memnew(ConfirmationDialog); + delete_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); delete_dialog->connect("canceled", callable_mp(this, &ReplicationEditor::_dialog_closed).bind(false)); delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &ReplicationEditor::_dialog_closed).bind(true)); add_child(delete_dialog); diff --git a/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp b/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp index 928d69980e..47ab170526 100644 --- a/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp +++ b/modules/navigation_2d/editor/navigation_region_2d_editor_plugin.cpp @@ -173,6 +173,7 @@ NavigationRegion2DEditor::NavigationRegion2DEditor() { rebake_timer->connect("timeout", callable_mp(this, &NavigationRegion2DEditor::_rebake_timer_timeout)); err_dialog = memnew(AcceptDialog); + err_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(err_dialog); node = nullptr; } diff --git a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp index 59542c2c6e..0131f5c625 100644 --- a/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_obstacle_3d_editor_plugin.cpp @@ -869,6 +869,7 @@ NavigationObstacle3DEditorPlugin::NavigationObstacle3DEditorPlugin() { button_clear->set_toggle_mode(true); button_clear_dialog = memnew(ConfirmationDialog); + button_clear_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); button_clear_dialog->set_title(TTR("Please Confirm...")); button_clear_dialog->set_text(TTR("Remove all vertices?")); button_clear_dialog->connect(SceneStringName(confirmed), callable_mp(NavigationObstacle3DEditorPlugin::singleton, &NavigationObstacle3DEditorPlugin::action_clear_vertices)); diff --git a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp index cbcf1a921c..63fd0bc2af 100644 --- a/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp +++ b/modules/navigation_3d/editor/navigation_region_3d_editor_plugin.cpp @@ -251,6 +251,7 @@ NavigationRegion3DEditor::NavigationRegion3DEditor() { bake_hbox->add_child(bake_info); err_dialog = memnew(AcceptDialog); + err_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); add_child(err_dialog); multibake_dialog = memnew(ConfirmationDialog); diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 06c1f4444c..9def512422 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -2645,6 +2645,7 @@ FileDialog::FileDialog() { confirm_save->connect(SceneStringName(confirmed), callable_mp(this, &FileDialog::_save_confirm_pressed)); delete_dialog = memnew(ConfirmationDialog); + delete_dialog->set_flag(Window::FLAG_RESIZE_DISABLED, true); delete_dialog->set_text(ETR("Delete the selected file?\nDepending on your filesystem configuration, the files will either be moved to the system trash or deleted permanently.")); add_child(delete_dialog, false, INTERNAL_MODE_FRONT); delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &FileDialog::_delete_confirm)); @@ -2663,10 +2664,12 @@ FileDialog::FileDialog() { make_dir_dialog->register_text_enter(new_dir_name); mkdirerr = memnew(AcceptDialog); + mkdirerr->set_flag(Window::FLAG_RESIZE_DISABLED, true); mkdirerr->set_text(ETR("Could not create folder.")); add_child(mkdirerr, false, INTERNAL_MODE_FRONT); exterr = memnew(AcceptDialog); + exterr->set_flag(Window::FLAG_RESIZE_DISABLED, true); exterr->set_text(ETR("Invalid extension, or empty filename.")); add_child(exterr, false, INTERNAL_MODE_FRONT);