Changeset 1102 for trunk/src/org/expeditee/items/MagneticConstraint/Utilities/BoxLogic.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/items/MagneticConstraint/Utilities/BoxLogic.java (modified) (2 diffs)

trunk/src/org/expeditee/items/MagneticConstraint/Utilities/BoxLogic.java

@@ -1 +1 @@
 package org.expeditee.items.MagneticConstraint.Utilities;
 
-import java.awt.Rectangle;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
 import org.expeditee.gui.Frame;
 import org.expeditee.items.Dot;
@@ -40 +40 @@
                         final int bottomPos = Math.max(canditate.getStartItem().getY(),
                                         canditate.getEndItem().getY());
-                        final Rectangle itemHitBox = item.getArea().getBounds();
-                        if (topPos < itemHitBox.getY() && bottomPos > itemHitBox.getY()) {
-                                if (itemHitBox.getX() + itemHitBox.getWidth() > canditate
-                                                .getStartItem().getX()
-                                                && itemHitBox.getX() < canditate.getStartItem().getX()) {
+                        final AxisAlignedBoxBounds itemHitBox = item.getBoundingBox();
+                        if (topPos < itemHitBox.getMinY() && bottomPos > itemHitBox.getMinY()) {
+                                if (itemHitBox.getMinX() + itemHitBox.getWidth() > canditate.getStartItem().getX() &&
+                                                itemHitBox.getMinX() < canditate.getStartItem().getX())
+                                {
                                         return true;
                                 }