chore(interactive-jtable): Check if mouse event is within using bounds

bric3 · Mar 25, 2024 · 478763f · 478763f
1 parent d95ef36
commit 478763f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/fireplace-app/src/main/java/io/github/bric3/fireplace/ui/table/InteractiveJTable.java b/fireplace-app/src/main/java/io/github/bric3/fireplace/ui/table/InteractiveJTable.java
@@ -774,16 +774,17 @@ public ProperMouseEnterExitListener(InteractiveJTable interactiveTable) {
                 if (source instanceof JComponent) {
                     var comp = (JComponent) source;
                     // The actual received event may come from a different component than the table
-                    var tableMouseEvent = SwingUtilities.convertMouseEvent(comp, (MouseEvent) awtEvent, interactiveTable);
-                    if (SwingUtilities.isDescendingFrom(comp, interactiveTable)) { // TODO check if within bounds ?
+                    var tableMouseEvent = SwingUtilities.convertMouseEvent(
+                            comp,
+                            (MouseEvent) awtEvent,
+                            interactiveTable
+                    );
+                    if (interactiveTable.contains(tableMouseEvent.getPoint())) {
                         // The mouse is in the house...
-
                         listeners.forEach(l -> l.mouseMoveWithin(tableMouseEvent));
-                        //rowHoveringListener.performHovering(() -> interactiveTable.rowAtPoint(SwingUtils.getLastPointerLocation(interactiveTable)));
                     } else {
                         // Mouse is outside
                         listeners.forEach(l -> l.mouseOut(tableMouseEvent));
-                        //rowHoveringListener.performHovering(() -> -1);
                     }
                 }
             }, AWTEvent.MOUSE_MOTION_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK);