Changeset 1102 for trunk/src/org/expeditee/items/MagneticConstraint/Actions/RepelTextDownAction.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/Actions/RepelTextDownAction.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package org.expeditee.items.MagneticConstraint.Actions;
 
-import java.awt.Point;
-
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.core.Point;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
@@ -28 +27 @@
                                 (FrameUtils.getCurrentItem().getPosition().equals(item.getPosition()) 
                                 && remainderOfLine.size() > 0 
-                                && TextLogic.XIsTowardsRight(DisplayIO.getMouseX(), (Text) remainderOfLine.getFirst()))) {
+                                && TextLogic.XIsTowardsRight(DisplayController.getMouseX(), (Text) remainderOfLine.getFirst()))) {
                         remainderOfLine.removeFirst();
                 }
@@ -42 +41 @@
                 if(!remainderOfLine.isEmpty() && currentParagraph.contains(nextLine) && MergeSameLineParagraphCollisions) { 
                         nextLine.prependLine(remainderOfLine);
-                        DisplayIO.setTextCursor((Text) remainderOfLine.getFirst(), Text.HOME);
+                        DisplayController.setTextCursor((Text) remainderOfLine.getFirst(), Text.HOME);
                         callback(remainderOfLine.getFirst());
                         FrameIO.SaveFrame(remainderOfLine.getLast().getParent());
                 } else if(!remainderOfLine.isEmpty()) {
                         newLineAt = currentParagraph.split(currentLine);
-                        final Point first = remainderOfLine.getBoundingBox().getLocation();
+                        final Point first = remainderOfLine.getBoundingBox().getTopLeft();
                         for(final Item token : remainderOfLine) {
                                 double newX = token.getX() - first.getX() + newLineAt.getX();
                                 token.setPosition((float) newX, (float) newLineAt.getY());
                         }
-                        DisplayIO.setTextCursor((Text) remainderOfLine.getFirst(), Text.HOME);
+                        DisplayController.setTextCursor((Text) remainderOfLine.getFirst(), Text.HOME);
                         callback(remainderOfLine.getFirst());
                         FrameIO.SaveFrame(remainderOfLine.getLast().getParent());
@@ -58 +57 @@
                                 //3a No. Move the cursor
                         newLineAt = currentParagraph.split(currentLine);
-                        DisplayIO.setCursorPosition(newLineAt);
+                        DisplayController.setCursorPosition(newLineAt);
                 }