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.

Sign up for GitHub

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

Jump to bottom

Fix regression through fa98637acaab9135568bf0d43a65c9c96b59c32d #17145

Merged
merged 1 commit into from Mar 1, 2018
Merged

Fix regression through fa98637acaab9135568bf0d43a65c9c96b59c32d #17145

merged 1 commit into from Mar 1, 2018

Conversation

poke1024
Copy link
Contributor

@poke1024 poke1024 commented Mar 1, 2018

I think the underlying bug here might be that line_ascent and line_descent get cleared inside NEW_LINE.

@hpvb
Copy link
Member

hpvb commented Mar 1, 2018

This also seems to fix #17139, and keeps adaptive line heights.

This PR:
screenshot from 2018-03-01 18-22-23
#17144:
screenshot from 2018-03-01 17-58-07

This was referenced Mar 1, 2018
Merged
Closed
@akien-mga akien-mga added this to the 3.1 milestone Mar 1, 2018
@akien-mga akien-mga merged commit 98609c3 into godotengine:master Mar 1, 2018
@hpvb hpvb removed the cherrypick label Mar 1, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug topic:core
Projects
None yet
Milestone
3.1
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@poke1024 @hpvb @akien-mga