Add customBorder to InkWell so it can clip ShapeBorder #20751
Merged
Conversation
This file contains hidden or 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
This was referenced Aug 17, 2018
HansMuller
approved these changes
Aug 20, 2018
Contributor
There was a problem hiding this comment.
Most of this method is the same for InkSplash and InkRipple (as it was before).
If _borderRadius, _customBorder, _clipCallback, _radius were factored into a common InkSplash and InkRipple mixin, then you could also factor out something like:
void paintInkCircle(Canvas canvas, Matrix4 transform, Paint paint, Offset center)
It doesn't seem essential to do that; just an observation.
Contributor
Author
There was a problem hiding this comment.
Thanks for the suggestion! Yes, I also found it ugly to write the almost identical code twice. I guess that I'll leave the cleaning change to the next PR just to make each PR as small as possible. Added to my TODO list.
liyuqian
added a commit
to flutter/goldens
that referenced
this pull request
Aug 21, 2018
liyuqian
added a commit
to liyuqian/flutter
that referenced
this pull request
Aug 22, 2018
This reverts commit 8de0e15 and updates the goldens versoin. This requires flutter#20751 to land first.
liyuqian
added a commit
that referenced
this pull request
Aug 24, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
This fixes #20483 by letting InkWell do its own clipping.
PathOp.intersect is not used because we have too many unit tests that rely on clipping (e.g.,
paints..clipXXX()..drawCircle())The goldens are updated due to small AA changes of the additional clipPath.