Skip to content

Introduce methods for computing the baseline location of a RenderBox without affecting the current layout #144655

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.

Sign up for GitHub

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

Merged
auto-submit merged 13 commits into from
Mar 18, 2024
Merged

Introduce methods for computing the baseline location of a RenderBox without affecting the current layout #144655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b7f071e
Introduce methods for computing the baseline location of a RenderBox …
LongCatIsLooong Mar 6, 2024
950564b
fix tests
LongCatIsLooong Mar 7, 2024
bd73e90
documentation
LongCatIsLooong Mar 7, 2024
f363c34
Fix IndexStack implementation
LongCatIsLooong Mar 7, 2024
4f7adcc
documentation
LongCatIsLooong Mar 8, 2024
3a8551f
documentation
LongCatIsLooong Mar 8, 2024
0f5a5a9
Merge remote-tracking branch 'upstream/main' into RenderBox-dryBaseli…
LongCatIsLooong Mar 8, 2024
55e181e
heh
LongCatIsLooong Mar 9, 2024
d60a731
tests
LongCatIsLooong Mar 10, 2024
e283dda
debugCannotComputeDryLayout
LongCatIsLooong Mar 10, 2024
1d6256d
Merge remote-tracking branch 'upstream/main' into RenderBox-dryBaseli…
LongCatIsLooong Mar 15, 2024
f28a04b
review
LongCatIsLooong Mar 16, 2024
e891d1d
fallback value -> dummy value
LongCatIsLooong Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/flutter/lib/src/material/input_decorator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,10 @@ class _RenderDecoration extends RenderBox with SlottedContainerRenderObjectMixin

@override
double computeDistanceToActualBaseline(TextBaseline baseline) {
return _boxParentData(input!).offset.dy + (input?.computeDistanceToActualBaseline(baseline) ?? 0.0);
final RenderBox? input = this.input;
return input == null
? 0.0
: _boxParentData(input).offset.dy + (input.computeDistanceToActualBaseline(baseline) ?? 0.0);
}

// Records where the label was painted.
Expand Down
6 changes: 4 additions & 2 deletions packages/flutter/lib/src/material/list_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,10 +1249,12 @@ class _RenderListTile extends RenderBox with SlottedContainerRenderObjectMixin<_
}

@override
double computeDistanceToActualBaseline(TextBaseline baseline) {
double? computeDistanceToActualBaseline(TextBaseline baseline) {
assert(title != null);
final BoxParentData parentData = title!.parentData! as BoxParentData;
return parentData.offset.dy + title!.getDistanceToActualBaseline(baseline)!;
final BaselineOffset offset = BaselineOffset(title!.getDistanceToActualBaseline(baseline))
+ parentData.offset.dy;
return offset.offset;
}

static double? _boxBaseline(RenderBox box, TextBaseline baseline) {
Expand Down
10 changes: 6 additions & 4 deletions packages/flutter/lib/src/material/toggle_buttons.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,11 +1175,13 @@ class _SelectToggleButtonRenderObject extends RenderShiftedBox {
}

@override
double computeDistanceToActualBaseline(TextBaseline baseline) {
double? computeDistanceToActualBaseline(TextBaseline baseline) {
// The baseline of this widget is the baseline of its child
return direction == Axis.horizontal
? child!.computeDistanceToActualBaseline(baseline)! + borderSide.width
: child!.computeDistanceToActualBaseline(baseline)! + leadingBorderSide.width;
final BaselineOffset childOffset = BaselineOffset(child?.computeDistanceToActualBaseline(baseline));
return switch (direction) {
Axis.horizontal => childOffset + borderSide.width,
Axis.vertical => childOffset + leadingBorderSide.width,
}.offset;
}

@override
Expand Down
Loading