Skip to content

Commit

Permalink
Revert "make Label consider spaces for visible_characters"
Browse files Browse the repository at this point in the history
This reverts commit 695980a.

Fixes godotengine#35668.
  • Loading branch information
akien-mga committed Jan 28, 2020
1 parent 1c3aff4 commit 11d28b2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion scene/gui/label.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 11d28b2

Please sign in to comment.