From d66f6b3b04f4d9e01b21466cb4c6497fbad204d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 22 Feb 2023 22:44:01 +0100 Subject: Revert "Fix visible_lines calculation" This reverts commit ceee405cec171506dde7bc62033dc52ac3797599. This caused regressions, see #73736 and #73780. Fixes #73780. --- scene/gui/label.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 81426158a2..b861d7af01 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -209,7 +209,10 @@ bool Label::_shape() { // Fill after min_size calculation. - int visible_lines = get_visible_line_count(); + int visible_lines = lines_rid.size(); + if (max_lines_visible >= 0 && visible_lines > max_lines_visible) { + visible_lines = max_lines_visible; + } if (autowrap_mode != TextServer::AUTOWRAP_OFF) { bool lines_hidden = visible_lines > 0 && visible_lines < lines_rid.size(); if (lines_hidden) { -- cgit v1.2.3