summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-07-03 12:43:20 +0200
committerGitHub <noreply@github.com>2020-07-03 12:43:20 +0200
commit9a82c3d6a5bc30ab353a9ad4d9def5ec70dd079c (patch)
treec0140c8362333368fb4d3386130608796218a80e /scene/gui
parent75ca669b8e92dc14519f106b787fdade0a1b040b (diff)
parent44f88999c7a19b2dce898210916a16498851c588 (diff)
Merge pull request #40081 from nekomatata/richtextlabel-fill-regression
Fix RichTextLabel fill alignment regression
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/rich_text_label.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 5ae27081ea..22e5bd55f3 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -256,7 +256,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
lh = line < l.height_caches.size() ? l.height_caches[line] : 1; \
line_ascent = line < l.ascent_caches.size() ? l.ascent_caches[line] : 1; \
line_descent = line < l.descent_caches.size() ? l.descent_caches[line] : 1; \
- if (p_mode == PROCESS_DRAW) { \
+ if ((p_mode == PROCESS_DRAW) && (align != ALIGN_FILL)) { \
if (line < l.offset_caches.size()) { \
wofs = l.offset_caches[line]; \
} \