diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-22 12:29:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 12:29:49 +0200 |
| commit | 1e0fb0dc144ce8b7daaa783a67b17c85bba5d57d (patch) | |
| tree | c87ea1141b6674f307f5f60d3bb6aefdfbf1e9b9 | |
| parent | a2871cc06b4acaf9b0f4a5e4cd4c99bc826ab059 (diff) | |
| parent | 8df330bacd61529d7d985ac0a038205cdc94b064 (diff) | |
Merge pull request #32833 from nekomatata/label-autowrap-fix
Allow Label autowrap to cut words when they exceed line width
| -rw-r--r-- | editor/node_dock.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/label.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/editor/node_dock.cpp b/editor/node_dock.cpp index d6df3bd369..7ba1796600 100644 --- a/editor/node_dock.cpp +++ b/editor/node_dock.cpp @@ -129,6 +129,7 @@ NodeDock::NodeDock() { 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_custom_minimum_size(Size2(100 * EDSCALE, 0)); select_a_node->set_v_size_flags(SIZE_EXPAND_FILL); select_a_node->set_valign(Label::VALIGN_CENTER); select_a_node->set_align(Label::ALIGN_CENTER); diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 510f1b18ad..4edd4b8530 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -452,6 +452,11 @@ void Label::regenerate_word_cache() { current_word_size += char_width; line_width += char_width; 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) { |