Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 34 additions & 3 deletions lib/src/ui/columns/pluto_column_title.dart
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,40 @@ class _ColumnWidget extends StatelessWidget {
required this.height,
});

EdgeInsets get padding =>
column.titlePadding ??
stateManager.configuration.style.defaultColumnTitlePadding;
EdgeInsets get padding {
final EdgeInsets basePadding = column.titlePadding ??
stateManager.configuration.style.defaultColumnTitlePadding;

final scrollbarConfig = stateManager.configuration.scrollbar;
final bool needsVerticalGap = scrollbarConfig.draggableScrollbar &&
stateManager.scroll.bodyRowsVertical != null;

if (!needsVerticalGap) {
return basePadding;
}

final double gap = scrollbarConfig.hoverWidth;

if (gap <= 0) {
return basePadding;
}

if (stateManager.isRTL) {
return EdgeInsets.fromLTRB(
basePadding.left + gap,
basePadding.top,
basePadding.right,
basePadding.bottom,
);
}

return EdgeInsets.fromLTRB(
basePadding.left,
basePadding.top,
basePadding.right + gap,
basePadding.bottom,
);
}

bool get showSizedBoxForIcon =>
column.isShowRightIcon &&
Expand Down
25 changes: 23 additions & 2 deletions lib/src/widgets/pluto_scrollbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -578,10 +578,31 @@ class PlutoGridCupertinoScrollbarState extends State<PlutoScrollbar>

@override
Widget build(BuildContext context) {
Widget child = CustomPaint(
final bool hasVerticalScrollbar = widget.verticalController != null;

final bool hasHorizontalScrollbar = widget.horizontalController != null;

Widget child = widget.child;

final double rightPadding =
hasVerticalScrollbar ? widget.hoverWidth : 0.0;
final double bottomPadding =
hasHorizontalScrollbar ? widget.hoverWidth : 0.0;

if (rightPadding > 0 || bottomPadding > 0) {
child = Padding(
padding: EdgeInsets.only(
right: rightPadding,
bottom: bottomPadding,
),
child: child,
);
}

child = CustomPaint(
key: _customPaintKey,
foregroundPainter: _painter,
child: RepaintBoundary(child: widget.child),
child: RepaintBoundary(child: child),
);

if (widget.enableHover) {
Expand Down
Loading