-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
Fix InlineUIContainer clipping in text when ArrangeOverride called. (#17183) #17194
base: master
Are you sure you want to change the base?
Fix InlineUIContainer clipping in text when ArrangeOverride called. (#17183) #17194
Conversation
You can test this PR using the following package version. |
Please read the following Contributor License Agreement (CLA). If you agree with the CLA, please reply with the following:
Contributor License AgreementContribution License AgreementThis Contribution License Agreement ( “Agreement” ) is agreed to by the party signing below ( “You” ), 1. Definitions. “Code” means the computer software code, whether in human-readable or machine-executable form, “Project” means any of the projects owned or managed by AvaloniaUI OÜ and offered under a license “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any “Submission” means the Code and any other copyrightable material Submitted by You, including any 2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any 3. Originality of Work. You represent that each of Your Submissions is entirely Your 4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else 5. Licenses. a. Copyright License. You grant AvaloniaUI OÜ, and those who receive the Submission directly b. Patent License. You grant AvaloniaUI OÜ, and those who receive the Submission directly or c. Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement. 6. Representations and Warranties. You represent that You are legally entitled to grant the above 7. Notice to AvaloniaUI OÜ. You agree to notify AvaloniaUI OÜ in writing of any facts or 8. Information about Submissions. You agree that contributions to Projects and information about 9. Governing Law/Jurisdiction. This Agreement is governed by the laws of the Republic of Estonia, and 10. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and AvaloniaUI OÜ dedicates this Contribution License Agreement to the public domain according to the Creative Commons CC0 1. |
@cla-avalonia agree |
src/Avalonia.Controls/TextBlock.cs
Outdated
@@ -727,6 +727,8 @@ protected override Size MeasureOverride(Size availableSize) | |||
return new Size(width, TextLayout.Height).Inflate(padding); | |||
} | |||
|
|||
List<Control> _embeddedControlRunControls = new(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isn't needed. VisualChildren holds all controls already.
Why do we need multiple arrange calls for embedded controls? There is some invalidation issue and we might need to invalidate visual children somewhere. I can't accept this "hack". |
It's a dirty hack, i understand that. I just don't understand how i can validate draw operation for inlines, if InlineUIContainer is not present in list of incoming runs. |
Embedded controls are added as a visual child to TextBlock https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Controls/Documents/InlineCollection.cs#L185 |
So i made a little research. |
You can test this PR using the following package version. |
Simply clear visual children in the arrange call and add them again before arranging the embedded runs. |
What does the pull request do?
Issue #17183
This pr fixes problem with InlineUIContainer clipping inside a text and stuck on coordinates.
What is the current behavior?
Currently InlineUIContainer will be rendered on top of other Run when Width of control will be changed.
What is the updated/expected behavior with this PR?
InlineUIContainer will be rendered outside of textblock when it's not present in collection of inlines.
Checklist
Breaking changes
Changes the behavior of Avalonia.ArrangeOverride int TextBlock.
Obsoletions / Deprecations
Fixed issues
Fixes #17183