From 5e389d9c5c3c20628c09d80312c17086b02c27c9 Mon Sep 17 00:00:00 2001
From: Karl von Randow <karl@xk72.com>
Date: Mon, 6 Nov 2023 07:29:04 +1300
Subject: [PATCH] JTableWithMargins: add rowAtPoint, fix columnAtPoint

---
 .../violetlib/vaquaclient/JTableWithMargins.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/org/violetlib/vaquaclient/JTableWithMargins.java b/src/org/violetlib/vaquaclient/JTableWithMargins.java
index ffe3f12..8149406 100644
--- a/src/org/violetlib/vaquaclient/JTableWithMargins.java
+++ b/src/org/violetlib/vaquaclient/JTableWithMargins.java
@@ -223,12 +223,21 @@ public void sizeColumnsToFit(int resizingColumn)
     @Override
     public int columnAtPoint(@NotNull Point point)
     {
-        if (margin > 0) {
-            point = new Point(point.x - margin, point.y);
+        if (margin > 0 || verticalMargin > 0) {
+            point = new Point(point.x - margin, point.y - verticalMargin);
         }
         return super.columnAtPoint(point);
     }
 
+    @Override
+    public int rowAtPoint(@NotNull Point point)
+    {
+        if (margin > 0 || verticalMargin > 0) {
+            point = new Point(point.x - margin, point.y - verticalMargin);
+        }
+        return super.rowAtPoint(point);
+    }
+
     @Override
     public @NotNull Rectangle getCellRect(int row, int column, boolean includeSpacing)
     {