Changeset 970 for trunk/src/org/expeditee/items/MagneticConstraint/Actions/RepelTextAction.java

Timestamp:

10/27/15 12:11:12 (9 years ago)

Author:

bln4

Message:

Ok, now when following a daisy chain it properly looks for loops. If it sees a loop it won't walk into it twice.

File:

• trunk/src/org/expeditee/items/MagneticConstraint/Actions/RepelTextAction.java (modified) (2 diffs)

trunk/src/org/expeditee/items/MagneticConstraint/Actions/RepelTextAction.java

@@ -3 +3 @@
 import java.awt.Point;
 
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 import org.expeditee.items.MagneticConstraint.MagneticConstraintActionWithArguments;
 import org.expeditee.items.MagneticConstraint.MagneticConstraints;
@@ -42 +44 @@
                         return false;
                 } else {
+                        final int charDistance = Browser._theBrowser.getFontMetrics(((Text)item).getFont()).stringWidth("X");
                         final Line tokensToMove = Line.getLineFromToken(item);
-                        System.err.println("#Repeling tokens: " + tokensToMove);
                         tokensToMove.removeFirst();
+                        boolean afterGap = false;
+                        for(int i = 1; i < tokensToMove.size();) {
+                                if(afterGap) tokensToMove.remove(i);
+                                else if((tokensToMove.get(i).getX() - charDistance) > (tokensToMove.get(i - 1).getX() + tokensToMove.get(i - 1).getBoundsWidth())) {
+                                        afterGap = true;
+                                        tokensToMove.remove(i);
+                                } else i++;
+                        }
                         tokensToMove.deltaX(args[0].intValue());
                         for(final Item token : tokensToMove) {