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

Allow Label autowrap to cut words when they exceed line width

Browse Source 
Fixes #30832
This commit is contained in:
PouleyKetchoupp 2019-10-14 18:51:07 +02:00
parent 26bbb26738
commit 8df330bacd
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/node_dock.cpp
View File

@ -129,6 +129,7 @@ NodeDock::NodeDock() {
select_a_node = memnew(Label); select_a_node = memnew(Label);
select_a_node->set_text(TTR("Select a single node to edit its signals and groups.")); select_a_node->set_text(TTR("Select a single node to edit its signals and groups."));
select_a_node->set_custom_minimum_size(Size2(100 * EDSCALE, 0));
select_a_node->set_v_size_flags(SIZE_EXPAND_FILL); select_a_node->set_v_size_flags(SIZE_EXPAND_FILL);
select_a_node->set_valign(Label::VALIGN_CENTER); select_a_node->set_valign(Label::VALIGN_CENTER);
select_a_node->set_align(Label::ALIGN_CENTER); select_a_node->set_align(Label::ALIGN_CENTER);

5
scene/gui/label.cpp
View File

@ -452,6 +452,11 @@ void Label::regenerate_word_cache() {
current_word_size += char_width; current_word_size += char_width;
line_width += char_width; line_width += char_width;
total_char_cache++; total_char_cache++;
// allow autowrap to cut words when they exceed line width
if (autowrap && (current_word_size > width)) {
separatable = true;
}
} }
if ((autowrap && (line_width >= width) && ((last && last->char_pos >= 0) || separatable)) || insert_newline) { if ((autowrap && (line_width >= width) && ((last && last->char_pos >= 0) || separatable)) || insert_newline) {