Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Label] Handle text as multiple independent paragraphs. #98605

Merged
merged 1 commit into from
Nov 29, 2024

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Oct 28, 2024

See #79599

@bruvzg bruvzg added this to the 4.x milestone Oct 28, 2024
Copy link
Member

@Calinou Calinou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally, it works as expected.

#79599 now performs much better when you replace the RichTextLabel with a Label and Word autowrap (note that I didn't set up the ScrollContainer). On an i9-13900K, it takes roughly 0.5s to open the licenses dialog with a debug editor build, whereas it took 3.5s previously.

RichTextLabel without threading is still noticeably faster though, even when compared to Label with autowrap disabled. With threading, there is no noticeable pause at all when opening the licenses dialog.

@bruvzg bruvzg force-pushed the lbl_mult_para branch 2 times, most recently from b6c9357 to c9e631a Compare November 14, 2024 06:25
@bruvzg bruvzg marked this pull request as ready for review November 14, 2024 06:28
@bruvzg bruvzg requested review from a team as code owners November 14, 2024 06:28
scene/gui/label.cpp Outdated Show resolved Hide resolved
scene/gui/label.cpp Outdated Show resolved Hide resolved
scene/gui/label.cpp Outdated Show resolved Hide resolved
scene/gui/label.cpp Show resolved Hide resolved
scene/gui/label.cpp Outdated Show resolved Hide resolved
scene/gui/label.cpp Outdated Show resolved Hide resolved
scene/gui/label.cpp Show resolved Hide resolved
@akien-mga akien-mga modified the milestones: 4.x, 4.4 Nov 28, 2024
@akien-mga akien-mga merged commit 5e87bda into godotengine:master Nov 29, 2024
20 checks passed
@akien-mga
Copy link
Member

Thanks!

@rsubtil
Copy link
Contributor

rsubtil commented Dec 1, 2024

@bruvzg this seems to have broken "empty multiline" strings for Label:

Peek.2024-12-01.18-44.mp4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants