Fix InlineUIContainer focus #14590
Merged
Fix InlineUIContainer focus #14590
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
You can test this PR using the following package version. |
maxkatz6
approved these changes
Feb 14, 2024
|
@Gillibald backport? |
Gillibald
added
the
backport-candidate-11.0.x
danwalmsley
pushed a commit
that referenced
this pull request
Feb 20, 2024
* Fix TextBlock MeasureOverride visual child handling * Make sure InlineUIContainer's child retains focus on measure * Resolve merge error # Conflicts: # src/Avalonia.Controls/TextBlock.cs
grokys
added a commit
that referenced
this pull request
Feb 20, 2024
* Fix TextBlock MeasureOverride visual child handling * Make sure InlineUIContainer's child retains focus on measure * Resolve merge error
maxkatz6
added
backported-11.0.x
and removed
backport-candidate-11.0.x
maxkatz6
pushed a commit
that referenced
this pull request
Feb 20, 2024
* Fix TextBlock MeasureOverride visual child handling * Make sure InlineUIContainer's child retains focus on measure * Resolve merge error #Conflicts: # src/Avalonia.Controls/TextBlock.cs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does the pull request do?
It changes the visual tree management of InlineUIContainers.
What is the current behavior?
Previously, embedded controls were added to the visual tree in the MeasureOverride but this also required resetting the visual tree. This in the end caused the embedded control to lose focus.
What is the updated/expected behavior with this PR?
The embedded control retains focus for multiple measure calls.
How was the solution implemented (if it's not obvious)?
The
InlinesCollectionnow adds visual children on add/remove to theIInlinesHost. So everything is in sync all the time.Checklist
Breaking changes
Obsoletions / Deprecations
Fixed issues
Fixes: #14557