godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #107517 from kitbdev/fix-test-warning-linebreak-setting

Browse Source 
Fix tests warning line break strictness project setting
This commit is contained in:
Rémi Verschelde
2025-06-16 01:52:38 +02:00
parent 1132e392a6 d9d1d25933
commit c1785e93d5
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/main.cpp
View File

@@ -2637,9 +2637,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
} }
} }
GLOBAL_DEF_BASIC("internationalization/locale/include_text_server_data", false);
GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "internationalization/locale/line_breaking_strictness", PROPERTY_HINT_ENUM, "Auto,Loose,Normal,Strict"), 0);
OS::get_singleton()->_allow_hidpi = GLOBAL_DEF("display/window/dpi/allow_hidpi", true); OS::get_singleton()->_allow_hidpi = GLOBAL_DEF("display/window/dpi/allow_hidpi", true);
OS::get_singleton()->_allow_layered = GLOBAL_DEF_RST("display/window/per_pixel_transparency/allowed", false); OS::get_singleton()->_allow_layered = GLOBAL_DEF_RST("display/window/per_pixel_transparency/allowed", false);

2
servers/text_server.cpp
View File

@@ -2357,6 +2357,8 @@ TextServer::TextServer() {
GLOBAL_DEF_RST("gui/theme/default_font_generate_mipmaps", false); GLOBAL_DEF_RST("gui/theme/default_font_generate_mipmaps", false);
GLOBAL_DEF(PropertyInfo(Variant::INT, "gui/theme/lcd_subpixel_layout", PROPERTY_HINT_ENUM, "Disabled,Horizontal RGB,Horizontal BGR,Vertical RGB,Vertical BGR"), 1); GLOBAL_DEF(PropertyInfo(Variant::INT, "gui/theme/lcd_subpixel_layout", PROPERTY_HINT_ENUM, "Disabled,Horizontal RGB,Horizontal BGR,Vertical RGB,Vertical BGR"), 1);
GLOBAL_DEF_BASIC("internationalization/locale/include_text_server_data", false);
GLOBAL_DEF_BASIC(PropertyInfo(Variant::INT, "internationalization/locale/line_breaking_strictness", PROPERTY_HINT_ENUM, "Auto,Loose,Normal,Strict"), 0);
_init_diacritics_map(); _init_diacritics_map();
} }