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

Set an appropriate minimum size for labels in windows that display incorrectly 

When the label's `autowrap_mode` is `AUTOWRAP_WORD_SMART` and the initial `text`
is set at the same time, it may have a higher height.

Set an appropriate minimum size for labels in windows that display incorrectly
so that these controls display properly.

(cherry picked from commit f932c6548e)
This commit is contained in:
风青山 2023-12-14 10:41:22 +08:00 committed by Yuri Sizov
parent 894d629185
commit f5ecaec1a4
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/export/project_export.cpp
View File

@ -1274,6 +1274,7 @@ ProjectExportDialog::ProjectExportDialog() {
server_strip_message = memnew(Label); server_strip_message = memnew(Label);
server_strip_message->set_visible(false); server_strip_message->set_visible(false);
server_strip_message->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART); server_strip_message->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
server_strip_message->set_custom_minimum_size(Size2(300 * EDSCALE, 1));
resources_vb->add_child(server_strip_message); resources_vb->add_child(server_strip_message);
{ {

4
editor/import/dynamic_font_import_settings.cpp
View File

@ -1345,6 +1345,7 @@ DynamicFontImportSettings::DynamicFontImportSettings() {
page2_description->set_text(TTR("Add font size, and variation coordinates, and select glyphs to pre-render:")); page2_description->set_text(TTR("Add font size, and variation coordinates, and select glyphs to pre-render:"));
page2_description->set_h_size_flags(Control::SIZE_EXPAND_FILL); page2_description->set_h_size_flags(Control::SIZE_EXPAND_FILL);
page2_description->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART); page2_description->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
page2_description->set_custom_minimum_size(Size2(300 * EDSCALE, 1));
page2_vb->add_child(page2_description); page2_vb->add_child(page2_description);
HSplitContainer *page2_hb = memnew(HSplitContainer); HSplitContainer *page2_hb = memnew(HSplitContainer);
@ -1418,6 +1419,7 @@ DynamicFontImportSettings::DynamicFontImportSettings() {
page2_0_description->set_text(TTR("Select translations to add all required glyphs to pre-render list:")); page2_0_description->set_text(TTR("Select translations to add all required glyphs to pre-render list:"));
page2_0_description->set_h_size_flags(Control::SIZE_EXPAND_FILL); page2_0_description->set_h_size_flags(Control::SIZE_EXPAND_FILL);
page2_0_description->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART); page2_0_description->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
page2_0_description->set_custom_minimum_size(Size2(300 * EDSCALE, 1));
page2_0_vb->add_child(page2_0_description); page2_0_vb->add_child(page2_0_description);
locale_tree = memnew(Tree); locale_tree = memnew(Tree);
@ -1449,6 +1451,7 @@ DynamicFontImportSettings::DynamicFontImportSettings() {
page2_1_description->set_text(TTR("Enter a text and select OpenType features to shape and add all required glyphs to pre-render list:")); page2_1_description->set_text(TTR("Enter a text and select OpenType features to shape and add all required glyphs to pre-render list:"));
page2_1_description->set_h_size_flags(Control::SIZE_EXPAND_FILL); page2_1_description->set_h_size_flags(Control::SIZE_EXPAND_FILL);
page2_1_description->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART); page2_1_description->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
page2_1_description->set_custom_minimum_size(Size2(300 * EDSCALE, 1));
page2_1_vb->add_child(page2_1_description); page2_1_vb->add_child(page2_1_description);
HSplitContainer *page2_1_hb = memnew(HSplitContainer); HSplitContainer *page2_1_hb = memnew(HSplitContainer);
@ -1486,6 +1489,7 @@ DynamicFontImportSettings::DynamicFontImportSettings() {
page2_2_description->set_text(TTR("Add or remove glyphs from the character map to pre-render list:\nNote: Some stylistic alternatives and glyph variants do not have one-to-one correspondence to character, and not shown in this map, use \"Glyphs from the text\" tab to add these.")); page2_2_description->set_text(TTR("Add or remove glyphs from the character map to pre-render list:\nNote: Some stylistic alternatives and glyph variants do not have one-to-one correspondence to character, and not shown in this map, use \"Glyphs from the text\" tab to add these."));
page2_2_description->set_h_size_flags(Control::SIZE_EXPAND_FILL); page2_2_description->set_h_size_flags(Control::SIZE_EXPAND_FILL);
page2_2_description->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART); page2_2_description->set_autowrap_mode(TextServer::AUTOWRAP_WORD_SMART);
page2_2_description->set_custom_minimum_size(Size2(300 * EDSCALE, 1));
page2_2_vb->add_child(page2_2_description); page2_2_vb->add_child(page2_2_description);
HSplitContainer *glyphs_split = memnew(HSplitContainer); HSplitContainer *glyphs_split = memnew(HSplitContainer);