@@ -861,27 +861,27 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
861
861
)! ;
862
862
863
863
Rect getColumnRect (bool consumePadding) {
864
- final double leadingOffsetCorrection =
864
+ final ({ double leading, double trailing}) offsetCorrection =
865
865
axisDirectionIsReversed (verticalAxisDirection)
866
- ? leadingCell.size.height
867
- : 0.0 ;
868
- final double trailingOffsetCorrection =
869
- axisDirectionIsReversed (verticalAxisDirection )
870
- ? trailingCell.size.height
871
- : 0.0 ;
866
+ ? (
867
+ leading : leadingCell.size.height,
868
+ trailing : trailingCell.size.height,
869
+ )
870
+ : (leading : 0.0 , trailing : 0.0 );
871
+
872
872
return Rect .fromPoints (
873
873
parentDataOf (leadingCell).paintOffset! +
874
874
offset -
875
875
Offset (
876
876
consumePadding ? columnSpan.padding.leading : 0.0 ,
877
- rowSpan.padding.leading - leadingOffsetCorrection ,
877
+ rowSpan.padding.leading - offsetCorrection.leading ,
878
878
),
879
879
parentDataOf (trailingCell).paintOffset! +
880
880
offset +
881
881
Offset (trailingCell.size.width, trailingCell.size.height) +
882
882
Offset (
883
883
consumePadding ? columnSpan.padding.trailing : 0.0 ,
884
- rowSpan.padding.trailing - trailingOffsetCorrection ,
884
+ rowSpan.padding.trailing - offsetCorrection.trailing ,
885
885
),
886
886
);
887
887
}
@@ -920,26 +920,25 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
920
920
)! ;
921
921
922
922
Rect getRowRect (bool consumePadding) {
923
- final double leadingOffsetCorrection =
924
- axisDirectionIsReversed (horizontalAxisDirection)
925
- ? leadingCell.size.height
926
- : 0.0 ;
927
- final double trailingOffsetCorrection =
923
+ final ({double leading, double trailing}) offsetCorrection =
928
924
axisDirectionIsReversed (horizontalAxisDirection)
929
- ? trailingCell.size.height
930
- : 0.0 ;
925
+ ? (
926
+ leading: leadingCell.size.width,
927
+ trailing: trailingCell.size.width,
928
+ )
929
+ : (leading: 0.0 , trailing: 0.0 );
931
930
return Rect .fromPoints (
932
931
parentDataOf (leadingCell).paintOffset! +
933
932
offset -
934
933
Offset (
935
- columnSpan.padding.leading - leadingOffsetCorrection ,
934
+ columnSpan.padding.leading - offsetCorrection.leading ,
936
935
consumePadding ? rowSpan.padding.leading : 0.0 ,
937
936
),
938
937
parentDataOf (trailingCell).paintOffset! +
939
938
offset +
940
939
Offset (trailingCell.size.width, trailingCell.size.height) +
941
940
Offset (
942
- columnSpan.padding.leading - trailingOffsetCorrection ,
941
+ columnSpan.padding.leading - offsetCorrection.trailing ,
943
942
consumePadding ? rowSpan.padding.trailing : 0.0 ,
944
943
),
945
944
);
0 commit comments