Keep hover annotation layers in sync with the mouse detector.#30829
Merged
gspencergoog merged 2 commits intoflutter:masterfrom Apr 11, 2019
Merged
Keep hover annotation layers in sync with the mouse detector.#30829gspencergoog merged 2 commits intoflutter:masterfrom
gspencergoog merged 2 commits intoflutter:masterfrom
Conversation
gspencergoog
changed the title
goderbauer
added
a: desktop
dkwingsmt
approved these changes
Apr 11, 2019
| if (_hoverAnnotation != null && attached) { | ||
| // Attach the new annotation. | ||
| RendererBinding.instance.mouseTracker.attachAnnotation(_hoverAnnotation); | ||
| } |
Contributor
There was a problem hiding this comment.
L2560-2571 took me a while to understand, I think a clearer way is
if (newAnnotation == null && _hoverAnnotation == null)
return
if (attached) {
if (_hoverAnnotation != null) {
RendererBinding.instance.mouseTracker.detachAnnotation(_hoverAnnotation);
}
if (newAnnotation != null) {
RendererBinding.instance.mouseTracker.attachAnnotation(_hoverAnnotation);
}
}
_hoverAnnotation = newAnnotation;
Contributor
Author
There was a problem hiding this comment.
That is clearer, except that I'd rather that _hoverAnnotation be up to date by the time attachAnnotation is called. I'll play with it some more and see if I can improve the readability.
Contributor
Author
There was a problem hiding this comment.
I basically reverted it to what it was before, since that was clearer. I added an assert which makes sure that something changed, since that was part of what I was trying to address with the reorg of the logic, but in reality it won't happen, since the callers all check and see that something changed before calling it.
jiisd
added a commit
to jiisd/flutter
that referenced
this pull request
Apr 12, 2019
* master: (209 commits) Allow mouse hover to only respond to some mouse events but not all. (flutter#30886) Fix issue 23527: Exception: RenderViewport exceeded its maximum number of layout cycles (flutter#30809) Keep hover annotation layers in sync with the mouse detector. (flutter#30829) Use identical instead of '==' in a constant expression. (flutter#30921) Add toggle for debugProfileWidgetBuilds (flutter#30867) Revert "Manual engine roll with disabled service authentication codes (flutter#30919)" (flutter#30930) Manual engine roll with disabled service authentication codes (flutter#30919) Baseline Aligned Row (flutter#30746) [Material] Fix showDialog crasher caused by old contexts (flutter#30754) Let `sliver.dart` `_createErrorWidget` work with other Widgets (flutter#30880) Add more dialog doc cross-reference (flutter#30887) Allow downloading of desktop embedding artifacts (flutter#30648) CupertinoDatePicker initialDateTime accounts for minuteInterval (flutter#30862) add golden tests for CupertinoDatePicker (flutter#30828) Simplify toImage future handling (flutter#30876) Fixed Table flex column layout error flutter#30437 (flutter#30470) Fix iTunes Transporter quirk (flutter#30883) Bump Android build tools to 28.0.3 in Dockerfile (flutter#30832) Update the upload key which seems to have trouble for some reason (flutter#30871) Check for invalid elevations (flutter#30215) ...
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 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.
Description
Adds a paint after detaching/attaching hover annotations to keep the annotation layers in sync with the annotations attached to the mouse detector.
Related Issues
Fixes #30744
Tests
Added a test that transfers focus between two listeners, and makes sure they both are detached at the end.
Checklist
Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (
[x]). This will ensure a smooth and quick review process.///).flutter analyze --flutter-repo) does not report any problems on my PR.Breaking Change
Does your PR require Flutter developers to manually update their apps to accommodate your change?