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

Do not shape and render null terminator #17119

Merged
merged 3 commits into from
Sep 26, 2024
Merged

Do not shape and render null terminator #17119

merged 3 commits into from
Sep 26, 2024

Conversation

Gillibald
Copy link
Contributor

@Gillibald Gillibald commented Sep 25, 2024 •
edited
Loading

What does the pull request do?

This PR ensures we do not try to shape and render null terminators. This matches what WPF is doing.

This PR reverts changes from here #17004

What is the current behavior?

What is the updated/expected behavior with this PR?

How was the solution implemented (if it's not obvious)?

Checklist

Breaking changes

Obsoletions / Deprecations

Fixed issues

@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.2.999-cibuild0052094-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.2.999-cibuild0052104-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@Gillibald Gillibald changed the title [WIP] Replace control codepoints with zero width space before they are being shaped [WIP] Do not shape null terminator Sep 25, 2024
@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.2.999-cibuild0052112-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@Gillibald Gillibald force-pushed the fixes/controlCodepoint branch from e88f972 to b859d24 Compare September 25, 2024 14:31
@Gillibald Gillibald changed the title [WIP] Do not shape null terminator Do not shape null terminator Sep 25, 2024
@Gillibald Gillibald changed the title Do not shape null terminator Do not shape and render null terminator Sep 25, 2024
@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.2.999-cibuild0052114-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@MrJul
Copy link
Member

MrJul commented Sep 25, 2024

This seems to work only if the null char is the first character in a line?
(e.g. "\0Foo\0Bar" still has the second null rendered)

@Gillibald Gillibald changed the title Do not shape and render null terminator [WIP] Do not shape and render null terminator Sep 25, 2024
@Gillibald Gillibald changed the title [WIP] Do not shape and render null terminator Do not shape and render null terminator Sep 26, 2024
@avaloniaui-bot
Copy link

You can test this PR using the following package version. 11.2.999-cibuild0052148-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

@Gillibald Gillibald added this pull request to the merge queue Sep 26, 2024
Merged via the queue into AvaloniaUI:master with commit 432fbe8 Sep 26, 2024
10 checks passed
@Gillibald Gillibald deleted the fixes/controlCodepoint branch September 26, 2024 11:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MrJul MrJul MrJul approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Gillibald @avaloniaui-bot @MrJul