diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-03-23 10:22:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-23 10:22:33 +0100 |
commit | 5f0ea4ddcfb8de5d0f1c3080a36d6291c26086ce (patch) | |
tree | 4985894f05bfb98b3106ecb1446ec6a11f151cf5 /scene/gui/rich_text_label.h | |
parent | aebe55210ade8832c7afad8a89c6dd441ddf89bb (diff) | |
parent | 5358befb412b0f21610619f61c5c41fea949cfc6 (diff) |
Merge pull request #17612 from robfram/fix-richtextlabel-bbcode
Fix bad rendering of BBCode tables in `RichTextLabel`
Diffstat (limited to 'scene/gui/rich_text_label.h')
-rw-r--r-- | scene/gui/rich_text_label.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index e7d5e6bb1b..83938cff61 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -87,6 +87,7 @@ private: int height_accum_cache; int char_count; int minimum_width; + int maximum_width; Line() { from = NULL; @@ -199,6 +200,7 @@ private: bool expand; int expand_ratio; int min_width; + int max_width; int width; }; |