Fix ScrollbarPainter thumbExtent calculation and add padding #31763
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
LongCatIsLooong
added
d: api docs
LongCatIsLooong
commented
Apr 29, 2019
LongCatIsLooong
force-pushed
the
scrollable-obstructions
branch
from
030f24b
to
96924ec
Compare
LongCatIsLooong
commented
Apr 29, 2019
LongCatIsLooong
commented
Apr 29, 2019
…flutter into scrollable-obstructions
Piinks
added
f: cupertino
|
Can you rebase to head to solve the merge conflict? |
LongCatIsLooong
force-pushed
the
scrollable-obstructions
branch
from
b76d326
to
4d3e39e
Compare
…flutter into scrollable-obstructions
LongCatIsLooong
force-pushed
the
scrollable-obstructions
branch
3 times, most recently
from
aa0a16f
to
21dda78
Compare
LongCatIsLooong
force-pushed
the
scrollable-obstructions
branch
from
21dda78
to
128c12b
Compare
|
@xster @HansMuller removed some randomly made-up terms in documentation. Could you take a look? |
xster
reviewed
May 9, 2019
| @@ -12,7 +12,10 @@ import 'scroll_metrics.dart'; | |||
|
|
|||
| const double _kMinThumbExtent = 18.0; | |||
|
|
|||
| /// A [CustomPainter] for painting scrollbars. | |||
| /// A [CustomPainter] for painting scrollbars. The size of the scrollbar along | |||
There was a problem hiding this comment.
Let the dartdoc's first sentence be a one line summary paragraph.
| await tester.pump(const Duration(milliseconds: 500)); | ||
|
|
||
| expect(find.byType(CupertinoScrollbar), paints..rrect( | ||
| color: _kScrollbarColor, |
| @@ -7,32 +7,74 @@ import 'package:flutter/material.dart'; | |||
|
|
|||
| import '../rendering/mock_canvas.dart'; | |||
|
|
|||
| Widget _buildSingleChildScrollViewWithScrollbar({ | |||
| TextDirection textDirection = TextDirection.ltr, | |||
HansMuller
reviewed
May 28, 2019
| @@ -60,14 +60,16 @@ abstract class ScrollMetrics { | |||
| /// | |||
| /// The actual [pixels] value might be [outOfRange]. | |||
| /// | |||
| /// This value can be negative infinity, if the scroll is unbounded. | |||
| /// This value must not be null and must be less than or equal to [maxScrollExtent]. | |||
| /// It can be negative infinity, if the scroll is unbounded. | |||
| double get minScrollExtent; | |||
There was a problem hiding this comment.
FixedScrollMetrics should assert that these constraints are true.
| ); | ||
| // Thumb extent reflects fraction of content visible, as long as this | ||
| // isn't less than the absolute minimum size. | ||
| // contentExtent >= viewportDimension, so (contentExtent - mainAxisPadding) > 0 |
| viewportBuilder: (BuildContext context, ViewportOffset offset) { | ||
| return Viewport( | ||
| await tester.pumpWidget( | ||
| MediaQuery( |
There was a problem hiding this comment.
I'm hoping that the only change to this test is just adding the MediaQuery
There was a problem hiding this comment.
I think that's the case. Should I make the MediaQuery dependency optional?
There was a problem hiding this comment.
It's fine as is; just difficult to read github diffs sometimes.
LongCatIsLooong
force-pushed
the
scrollable-obstructions
branch
from
9184687
to
67d9e58
Compare
kiku-jw
pushed a commit
to kiku-jw/flutter
that referenced
this pull request
Jun 14, 2019
…#31763) - Fixed extentInside calculation in ScrollMetrics - Added asserts to extentInside getter, as well as ScrollPosition.applyContentDimensions to enforce minScrollExtent <= maxScrollExtent - Added padding to ScrollbarPainter, updated implementation. Took care of some edge cases. - Changed some scroll bar constants on Cupertino side.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
extentInsidecalculation inScrollMetricsextentInsidegetter, as well asScrollPosition.applyContentDimensionsto enforceminScrollExtent <= maxScrollExtentScrollbarPainter, updated implementation. Took care of some edge cases.Related Issues
Fixes #31430, partially fixes #13253 and #25802
Tests
I added the following tests:
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?
Appendix: Screenshots from iPhone XR running iOS 12.1
Both horizontal and vertical scrollbars are visible and overscrolling
Only the horizontal scrollbars is visible and overscrolling
Only the vertical scrollbars is visible and overscrolling
