From f7f54f1d7b8d58bf4adc1ef6a8bc05a94b0160a1 Mon Sep 17 00:00:00 2001 From: Karl von Randow Date: Sun, 11 Jun 2023 12:00:00 +1200 Subject: [PATCH] table header: respect intercellSpacing for header cells --- src/org/violetlib/aqua/AquaTableHeaderUI.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/violetlib/aqua/AquaTableHeaderUI.java b/src/org/violetlib/aqua/AquaTableHeaderUI.java index b5f030d..8c4a8ce 100644 --- a/src/org/violetlib/aqua/AquaTableHeaderUI.java +++ b/src/org/violetlib/aqua/AquaTableHeaderUI.java @@ -304,8 +304,10 @@ private void paintCell(Graphics g, Rectangle cellRect, int columnIndex) { rendererComponent.setForeground(foreground); } - rendererPane.paintComponent(g, rendererComponent, header, cellRect.x, cellRect.y, - cellRect.width, cellRect.height, true); + final Dimension intercellSpacing = header.getTable().getIntercellSpacing(); + + rendererPane.paintComponent(g, rendererComponent, header, cellRect.x + intercellSpacing.width / 2, cellRect.y, + cellRect.width - intercellSpacing.width, cellRect.height, true); // Setting the foreground or background color of a DefaultTableCellRenderer makes that color the color // to use when the cell is not selected. So, if we installed a color, we should also remove it.