Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[TextServer] Use a separate flag to disable min. string length for adding ellipsis.

Browse source
This commit is contained in:
Pāvels Nadtočajevs 2025-09-11 13:05:31 +03:00
parent b79fe2e020
commit 5fdcb805d4
No known key found for this signature in database
GPG key ID: 8413210218EF35D2
5 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
servers/text/text_server.cpp
View file

@ -608,6 +608,7 @@ void TextServer::_bind_methods() {
BIND_BITFIELD_FLAG(OVERRUN_ADD_ELLIPSIS);
BIND_BITFIELD_FLAG(OVERRUN_ENFORCE_ELLIPSIS);
BIND_BITFIELD_FLAG(OVERRUN_JUSTIFICATION_AWARE);
BIND_BITFIELD_FLAG(OVERRUN_SHORT_STRING_ELLIPSIS);
/* GraphemeFlag */
BIND_BITFIELD_FLAG(GRAPHEME_IS_VALID);
@ -2398,12 +2399,12 @@ BitField<TextServer::TextOverrunFlag> TextServer::get_overrun_flags_from_behavio
overrun_flags.set_flag(OVERRUN_TRIM);
overrun_flags.set_flag(OVERRUN_TRIM_WORD_ONLY);
overrun_flags.set_flag(OVERRUN_ADD_ELLIPSIS);
overrun_flags.set_flag(OVERRUN_ENFORCE_ELLIPSIS);
overrun_flags.set_flag(OVERRUN_SHORT_STRING_ELLIPSIS);
} break;
case OVERRUN_TRIM_ELLIPSIS_FORCE: {
overrun_flags.set_flag(OVERRUN_TRIM);
overrun_flags.set_flag(OVERRUN_ADD_ELLIPSIS);
overrun_flags.set_flag(OVERRUN_ENFORCE_ELLIPSIS);
overrun_flags.set_flag(OVERRUN_SHORT_STRING_ELLIPSIS);
} break;
case OVERRUN_TRIM_WORD_ELLIPSIS:
overrun_flags.set_flag(OVERRUN_TRIM);

1
servers/text/text_server.h
View file

@ -137,6 +137,7 @@ public:
OVERRUN_ADD_ELLIPSIS = 1 << 2,
OVERRUN_ENFORCE_ELLIPSIS = 1 << 3,
OVERRUN_JUSTIFICATION_AWARE = 1 << 4,
OVERRUN_SHORT_STRING_ELLIPSIS = 1 << 5,
};
enum GraphemeFlag {