From 48f8022b97030abb1d54c1a840976e467a72ad9e Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Mon, 26 Aug 2024 18:36:55 +0200
Subject: [PATCH] Fix checkbox not being aligned on top when selected

---
 .../componentanalysis/CAExportPanel.java      | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAExportPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAExportPanel.java
index 1ae8b2afc..fe981c649 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAExportPanel.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/componentanalysis/CAExportPanel.java
@@ -15,6 +15,7 @@ import info.openrocket.swing.gui.widgets.SaveFileChooser;
 
 import javax.swing.AbstractCellEditor;
 import javax.swing.BorderFactory;
+import javax.swing.DefaultCellEditor;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JFileChooser;
@@ -100,7 +101,9 @@ public class CAExportPanel extends CSVExportPanel<CADataType> {
 		super.initializeTable(types);
 
 		// Set custom renderers for each column
-		table.getColumnModel().getColumn(0).setCellRenderer(new CheckBoxRenderer());
+		TableColumn firstColumn = table.getColumnModel().getColumn(0);
+		firstColumn.setCellRenderer(new CheckBoxRenderer());
+		firstColumn.setCellEditor(new CheckBoxEditor());
 		table.getColumnModel().getColumn(1).setCellRenderer(new LeftAlignedRenderer());
 		table.getColumnModel().getColumn(2).setCellRenderer(new LeftAlignedRenderer());
 
@@ -261,7 +264,6 @@ public class CAExportPanel extends CSVExportPanel<CADataType> {
 	private static class CheckBoxRenderer extends JCheckBox implements TableCellRenderer {
 		public CheckBoxRenderer() {
 			setHorizontalAlignment(JLabel.CENTER);
-			setVerticalAlignment(JLabel.TOP);
 		}
 
 		@Override
@@ -270,10 +272,29 @@ public class CAExportPanel extends CSVExportPanel<CADataType> {
 			setBackground(isSelected ? table.getSelectionBackground() : table.getBackground());
 			setForeground(isSelected ? table.getSelectionForeground() : table.getForeground());
 			setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); // Add top padding
+			setVerticalAlignment(JLabel.TOP);
 			return this;
 		}
 	}
 
+	private static class CheckBoxEditor extends DefaultCellEditor {
+		public CheckBoxEditor() {
+			super(new JCheckBox());
+			((JCheckBox)getComponent()).setHorizontalAlignment(JLabel.CENTER);
+		}
+
+		@Override
+		public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
+			Component c = super.getTableCellEditorComponent(table, value, isSelected, row, column);
+			if (c instanceof JCheckBox) {
+				JCheckBox cb = (JCheckBox) c;
+				cb.setVerticalAlignment(JLabel.TOP);
+				cb.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
+			}
+			return c;
+		}
+	}
+
 	private static class LeftAlignedRenderer extends DefaultTableCellRenderer {
 		public LeftAlignedRenderer() {
 			setHorizontalAlignment(JLabel.LEFT);