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

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

@@ -1 +1 @@
 package org.expeditee.items.MagneticConstraint.Utilities;
 
-import org.expeditee.gui.Browser;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.items.Text;
 
@@ -9 +9 @@
         public static boolean XIsTowardsRight(final int x, final Text text) {
                 if(text.getPixelBoundsUnion() == null) return false;
-                final double distanceThroughText = x - text.getPixelBoundsUnion().getX();
+                final double distanceThroughText = x - text.getPixelBoundsUnion().getMinX();
                 return /*text.getText().length() == 1 ||*/ distanceThroughText > (text.getPixelBoundsUnion().getWidth() / 2);
         }
@@ -15 +15 @@
         public static boolean XIsTowardsLeft(final Text text, final int x) {
                 if(text.getPixelBoundsUnion() == null) return false;
-                final double distanceThroughText = x - text.getPixelBoundsUnion().getX();
+                final double distanceThroughText = x - text.getPixelBoundsUnion().getMinX();
                 return distanceThroughText < (text.getPixelBoundsUnion().getWidth() / 2);
         }
@@ -21 +21 @@
         public static boolean XIsBeforeCharacters(final Text text, final int x) {
                 try {
-                        final int firstLetterWidth = Browser._theBrowser.getFontMetrics(Browser._theBrowser.getFont()).stringWidth(text.getText().substring(0, 1));
-                        final double distanceThroughText = x - text.getPixelBoundsUnion().getX();
+                        final int firstLetterWidth = EcosystemManager.getTextLayoutManager().getStringWidth(null, text.getText().substring(0, 1));
+                        final double distanceThroughText = x - text.getPixelBoundsUnion().getMinX();
                         return firstLetterWidth > distanceThroughText;
                 } catch (NullPointerException e) {
@@ -33 +33 @@
         public static boolean XIsAfterCharacters(final Text text, final int x) {
                 try {
-                        final double distanceThroughText = x - text.getPixelBoundsUnion().getX();
+                        final double distanceThroughText = x - text.getPixelBoundsUnion().getMinX();
                         return distanceThroughText > text.getPixelBoundsUnion().getWidth();
                 } catch (NullPointerException e) {
@@ -41 +41 @@
         
         public static int GetInsertionIndexSelected(final Text text) {
-                return text.getCharPosition(0, DisplayIO.getMouseX()).getInsertionIndex();
+                return text.getCharPosition(0, DisplayController.getMouseX()).getInsertionIndex();
         }
 }