Skip to content

[two_dimensional_scrollables] Add TableSpanPadding #5039

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 6 commits into from
Oct 26, 2023
Merged

[two_dimensional_scrollables] Add TableSpanPadding #5039

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d357abd
Add TableSpanPadding
Piinks Sep 29, 2023
c62a209
++
Piinks Oct 10, 2023
0c09049
More edge cases
Piinks Oct 13, 2023
d8040f2
++
Piinks Oct 18, 2023
2245e8c
Capture span decoration consuming padding or not
Piinks Oct 18, 2023
dfbda1c
Nits
Piinks Oct 18, 2023
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
Prev Previous commit
Next Next commit
++
  • Loading branch information
@Piinks
Piinks committed Oct 18, 2023
commit d8040f2f9c20273ce0873495c30ee35ca14e3e9a
103 changes: 56 additions & 47 deletions packages/two_dimensional_scrollables/lib/src/table_view/table.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,41 +844,45 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
final LinkedHashMap<Rect, TableSpanDecoration> backgroundColumns =
LinkedHashMap<Rect, TableSpanDecoration>();

final _Span rowSpan = _rowMetrics[leading.row]!;
final TableSpan rowSpan = _rowMetrics[leading.row]!.configuration;
for (int column = leading.column; column <= trailing.column; column++) {
final _Span columnSpan = _columnMetrics[column]!;
if (columnSpan.configuration.backgroundDecoration != null ||
columnSpan.configuration.foregroundDecoration != null) {
final TableSpan columnSpan = _columnMetrics[column]!.configuration;
if (columnSpan.backgroundDecoration != null ||
columnSpan.foregroundDecoration != null) {
final RenderBox leadingCell = getChildFor(
TableVicinity(column: column, row: leading.row),
)!;
final RenderBox trailingCell = getChildFor(
TableVicinity(column: column, row: trailing.row),
)!;

Rect getColumnRect(bool consumePadding) {
return Rect.fromPoints(
parentDataOf(leadingCell).paintOffset! +
offset -
Offset(
consumePadding ? columnSpan.padding.leading : 0.0,
rowSpan.padding.leading,
),
parentDataOf(trailingCell).paintOffset! +
Offset(trailingCell.size.width, trailingCell.size.height) +
offset +
Offset(
consumePadding ? columnSpan.padding.trailing : 0.0,
rowSpan.padding.trailing,
),
);
}

final Rect rect = Rect.fromPoints(
parentDataOf(leadingCell).paintOffset! +
offset -
Offset(
columnSpan.configuration.padding.leading,
rowSpan.configuration.padding.leading,
),
parentDataOf(trailingCell).paintOffset! +
Offset(trailingCell.size.width, trailingCell.size.height) +
offset +
Offset(
columnSpan.configuration.padding.trailing,
rowSpan.configuration.padding.trailing,
),
);

if (columnSpan.configuration.backgroundDecoration != null) {
if (columnSpan.backgroundDecoration != null) {
final Rect rect = getColumnRect(columnSpan.backgroundDecoration!.consumeSpanPadding);
backgroundColumns[rect] =
columnSpan.configuration.backgroundDecoration!;
columnSpan.backgroundDecoration!;
}
if (columnSpan.configuration.foregroundDecoration != null) {
if (columnSpan.foregroundDecoration != null) {
final Rect rect = getColumnRect(columnSpan.foregroundDecoration!.consumeSpanPadding);
foregroundColumns[rect] =
columnSpan.configuration.foregroundDecoration!;
columnSpan.foregroundDecoration!;
}
}
}
Expand All @@ -889,38 +893,43 @@ class RenderTableViewport extends RenderTwoDimensionalViewport {
final LinkedHashMap<Rect, TableSpanDecoration> backgroundRows =
LinkedHashMap<Rect, TableSpanDecoration>();

final _Span columnSpan = _columnMetrics[leading.column]!;
final TableSpan columnSpan = _columnMetrics[leading.column]!.configuration;
for (int row = leading.row; row <= trailing.row; row++) {
final _Span rowSpan = _rowMetrics[row]!;
if (rowSpan.configuration.backgroundDecoration != null ||
rowSpan.configuration.foregroundDecoration != null) {
final TableSpan rowSpan = _rowMetrics[row]!.configuration;
if (rowSpan.backgroundDecoration != null ||
rowSpan.foregroundDecoration != null) {
final RenderBox leadingCell = getChildFor(
TableVicinity(column: leading.column, row: row),
)!;
final RenderBox trailingCell = getChildFor(
TableVicinity(column: trailing.column, row: row),
)!;

final Rect rect = Rect.fromPoints(
parentDataOf(leadingCell).paintOffset! +
offset -
Offset(
columnSpan.configuration.padding.leading,
rowSpan.configuration.padding.leading,
),
parentDataOf(trailingCell).paintOffset! +
Offset(trailingCell.size.width, trailingCell.size.height) +
offset +
Offset(
columnSpan.configuration.padding.leading,
rowSpan.configuration.padding.trailing,
),
);
if (rowSpan.configuration.backgroundDecoration != null) {
backgroundRows[rect] = rowSpan.configuration.backgroundDecoration!;
Rect getRowRect(bool consumePadding) {
return Rect.fromPoints(
parentDataOf(leadingCell).paintOffset! +
offset -
Offset(
columnSpan.padding.leading,
consumePadding ? rowSpan.padding.leading : 0.0,
),
parentDataOf(trailingCell).paintOffset! +
Offset(trailingCell.size.width, trailingCell.size.height) +
offset +
Offset(
columnSpan.padding.leading,
consumePadding ? rowSpan.padding.trailing : 0.0,
),
);
}

if (rowSpan.backgroundDecoration != null) {
final Rect rect = getRowRect(rowSpan.backgroundDecoration!.consumeSpanPadding);
backgroundRows[rect] = rowSpan.backgroundDecoration!;
}
if (rowSpan.configuration.foregroundDecoration != null) {
foregroundRows[rect] = rowSpan.configuration.foregroundDecoration!;
if (rowSpan.foregroundDecoration != null) {
final Rect rect = getRowRect(rowSpan.foregroundDecoration!.consumeSpanPadding);
foregroundRows[rect] = rowSpan.foregroundDecoration!;
}
}
}
Expand Down