@@ -861,27 +861,27 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
861861 )! ;
862862
863863 Rect getColumnRect (bool consumePadding) {
864- final double leadingOffsetCorrection =
864+ final ({ double leading, double trailing}) offsetCorrection =
865865 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+
872872 return Rect .fromPoints (
873873 parentDataOf (leadingCell).paintOffset! +
874874 offset -
875875 Offset (
876876 consumePadding ? columnSpan.padding.leading : 0.0 ,
877- rowSpan.padding.leading - leadingOffsetCorrection ,
877+ rowSpan.padding.leading - offsetCorrection.leading ,
878878 ),
879879 parentDataOf (trailingCell).paintOffset! +
880880 offset +
881881 Offset (trailingCell.size.width, trailingCell.size.height) +
882882 Offset (
883883 consumePadding ? columnSpan.padding.trailing : 0.0 ,
884- rowSpan.padding.trailing - trailingOffsetCorrection ,
884+ rowSpan.padding.trailing - offsetCorrection.trailing ,
885885 ),
886886 );
887887 }
@@ -920,26 +920,25 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
920920 )! ;
921921
922922 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 =
928924 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 );
931930 return Rect .fromPoints (
932931 parentDataOf (leadingCell).paintOffset! +
933932 offset -
934933 Offset (
935- columnSpan.padding.leading - leadingOffsetCorrection ,
934+ columnSpan.padding.leading - offsetCorrection.leading ,
936935 consumePadding ? rowSpan.padding.leading : 0.0 ,
937936 ),
938937 parentDataOf (trailingCell).paintOffset! +
939938 offset +
940939 Offset (trailingCell.size.width, trailingCell.size.height) +
941940 Offset (
942- columnSpan.padding.leading - trailingOffsetCorrection ,
941+ columnSpan.padding.leading - offsetCorrection.trailing ,
943942 consumePadding ? rowSpan.padding.trailing : 0.0 ,
944943 ),
945944 );
0 commit comments