From 573b7247bf054e32168c443a84deee18989dd863 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Thu, 20 May 2021 08:07:52 -0400 Subject: [PATCH] Set a minimum size for status panel elements in ScriptCreateDialog --- doc/classes/ScriptCreateDialog.xml | 6 +++--- editor/script_create_dialog.cpp | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/classes/ScriptCreateDialog.xml b/doc/classes/ScriptCreateDialog.xml index 5d49a33f578..f5ee6a3c256 100644 --- a/doc/classes/ScriptCreateDialog.xml +++ b/doc/classes/ScriptCreateDialog.xml @@ -33,9 +33,9 @@ - - - + + + diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 3d00fbf4c19..d9a5ef5b02a 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -725,6 +725,7 @@ void ScriptCreateDialog::_update_dialog() { } get_ok()->set_disabled(!script_ok); + set_size(Vector2()); minimum_size_changed(); } @@ -758,6 +759,7 @@ ScriptCreateDialog::ScriptCreateDialog() { /* Error Messages Field */ VBoxContainer *vb = memnew(VBoxContainer); + vb->set_custom_minimum_size(Size2(340, 30) * EDSCALE); error_label = memnew(Label); vb->add_child(error_label); @@ -766,6 +768,7 @@ ScriptCreateDialog::ScriptCreateDialog() { vb->add_child(path_error_label); builtin_warning_label = memnew(Label); + builtin_warning_label->set_custom_minimum_size(Size2(340, 10) * EDSCALE); builtin_warning_label->set_text( TTR("Note: Built-in scripts have some limitations and can't be edited using an external editor.")); vb->add_child(builtin_warning_label); @@ -773,6 +776,7 @@ ScriptCreateDialog::ScriptCreateDialog() { builtin_warning_label->hide(); script_name_warning_label = memnew(Label); + script_name_warning_label->set_custom_minimum_size(Size2(340, 10) * EDSCALE); script_name_warning_label->set_text( TTR("Warning: Having the script name be the same as a built-in type is usually not desired.")); vb->add_child(script_name_warning_label); @@ -781,6 +785,7 @@ ScriptCreateDialog::ScriptCreateDialog() { script_name_warning_label->hide(); status_panel = memnew(PanelContainer); + status_panel->set_custom_minimum_size(Size2(350, 40) * EDSCALE); status_panel->set_h_size_flags(Control::SIZE_FILL); status_panel->add_child(vb);