diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-28 19:35:09 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-28 19:37:04 +0100 |
| commit | 11d28b2d10f904c8fa1336c5e4c50e952cb5d068 (patch) | |
| tree | a461f2e101550f45be8d8a9b1f50bc22f5669c26 | |
| parent | 1c3aff42dea3f9d9c49e6395dd4a9c848e65cbf6 (diff) | |
Revert "make Label consider spaces for visible_characters"
This reverts commit 695980a0f21adbe66eb12e1015fdc8c51fb62bf9.
Fixes #35668.
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | scene/gui/label.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c7202cabb8..f6c155ca65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -449,7 +449,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - Decreased the `rotation_degrees` range in various nodes to -360..360 to be easier to adjust using the slider. - Lower and higher values can still be entered manually, which is useful for animation purposes. - The default RichTextLabel color is now `#ffffff`, matching the default Label color for better consistency. -- Label's `visible_characters` property now takes spaces into account to be consistent with RichTextLabel. - SpinBoxes now calculate the entered value using the Expression class. - For example, writing `2 + 2` in a SpinBox then pressing Enter will result in `4`. - Saved resources no longer contain dependency indices and metadata such as node folding, resulting in more VCS-friendly files. diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 77913efd1c..9b542cb179 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -232,7 +232,6 @@ void Label::_notification(int p_what) { return; } if (from->space_count) { - chars_total += from->space_count; /* spacing */ x_ofs += space_w * from->space_count; if (can_fill && align == ALIGN_FILL && spaces) { |