Merge pull request #56993 from bruvzg/rtl_get_cnth

This commit is contained in:
Rémi Verschelde 2022-01-20 13:42:07 +01:00 committed by GitHub
commit 4075866117
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2705,6 +2705,7 @@ void RichTextLabel::install_effect(const Variant effect) {
int RichTextLabel::get_content_height() const { int RichTextLabel::get_content_height() const {
int total_height = 0; int total_height = 0;
const_cast<RichTextLabel *>(this)->_validate_line_caches(main);
if (main->lines.size()) { if (main->lines.size()) {
total_height = main->lines[main->lines.size() - 1].height_accum_cache + get_stylebox("normal")->get_minimum_size().height; total_height = main->lines[main->lines.size() - 1].height_accum_cache + get_stylebox("normal")->get_minimum_size().height;
} }
@ -2886,7 +2887,6 @@ Size2 RichTextLabel::get_minimum_size() const {
} }
if (fixed_width != -1 || fit_content_height) { if (fixed_width != -1 || fit_content_height) {
const_cast<RichTextLabel *>(this)->_validate_line_caches(main);
size.y = get_content_height(); size.y = get_content_height();
} }